diff --git a/forge-gui/res/cardsfolder/upcoming/arms_race.txt b/forge-gui/res/cardsfolder/upcoming/arms_race.txt
index 5e5d5622ba4..ca4d0a34697 100644
--- a/forge-gui/res/cardsfolder/upcoming/arms_race.txt
+++ b/forge-gui/res/cardsfolder/upcoming/arms_race.txt
@@ -7,6 +7,6 @@ SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:NonStackingEffect:True
 AI:RemoveDeck:Random
 SVar:PlayMain1:ALWAYS
-DeckHints:Type$Artifact
+DeckNeeds:Type$Artifact
 DeckHas:Keyword$Haste & Ability$Sacrifice
 Oracle:{3}{R}: You may put an artifact card from your hand onto the battlefield. The artifact gains haste. Sacrifice it at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/upcoming/bladewhip_transmogrant.txt b/forge-gui/res/cardsfolder/upcoming/bladewhip_transmogrant.txt
index 9beaf5f50b7..96fc1c84bc5 100644
--- a/forge-gui/res/cardsfolder/upcoming/bladewhip_transmogrant.txt
+++ b/forge-gui/res/cardsfolder/upcoming/bladewhip_transmogrant.txt
@@ -5,7 +5,7 @@ PT:3/1
 K:CARDNAME can't block.
 A:AB$ ChangeZone | Cost$ 4 B B | Origin$ Graveyard | Destination$ Battlefield | ReduceCost$ X | WithCountersType$ P1P1 | ActivationZone$ Graveyard | SpellDescription$ Return CARDNAME from the graveyard to the battlefield with a +1/+1 counter on it. This ability costs 4 less to activate if an opponent controls four or more nonbasic lands.
 SVar:X:Count$Compare Y GE4.4.0
-SVar:Y:Count$Valid Land.OppCtrl+nonBasic
+SVar:Y:PlayerCountOpponents$HighestValid Land.nonBasic+YouCtrl
 SVar:SacMe:2
 DeckHas:Ability$Graveyard|Counters
-Oracle:Bladewhip Transmogrant can't block.\n{4}{B}{B}:Return Bladewhip Transmogrant from the graveyard to the battlefield with a +1/+1 counter on it. This ability costs 4 less to activate if an opponent controls four or more nonbasic lands.
+Oracle:Bladewhip Transmogrant can't block.\n{4}{B}{B}: Return Bladewhip Transmogrant from the graveyard to the battlefield with a +1/+1 counter on it. This ability costs 4 less to activate if an opponent controls four or more nonbasic lands.
diff --git a/forge-gui/res/cardsfolder/upcoming/gnawing_vermin.txt b/forge-gui/res/cardsfolder/upcoming/gnawing_vermin.txt
index 706b33d0666..15739e5fe3a 100644
--- a/forge-gui/res/cardsfolder/upcoming/gnawing_vermin.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gnawing_vermin.txt
@@ -3,7 +3,7 @@ ManaCost:B
 Types:Creature Rat
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters the battlefield, target player mills three cards.
-SVar:TrigMill:DB$ Mill | NumCards$ 3 | ValidTgts$ Player | TgtPrompt$ Choose a player
+SVar:TrigMill:DB$ Mill | NumCards$ 3 | ValidTgts$ Player
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDebuff | TriggerDescription$ When CARDNAME dies, target creature you don't control gets -1/-1 until end of turn.
 SVar:TrigDebuff:DB$ Pump | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True
 DeckHas:Ability$Mill
diff --git a/forge-gui/res/cardsfolder/upcoming/hero_of_the_dunes.txt b/forge-gui/res/cardsfolder/upcoming/hero_of_the_dunes.txt
index fd9c013cb3c..63c68d63192 100644
--- a/forge-gui/res/cardsfolder/upcoming/hero_of_the_dunes.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hero_of_the_dunes.txt
@@ -3,7 +3,7 @@ ManaCost:3 W B
 Types:Creature Human Soldier
 PT:3/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, return target artifact or creature card with mana value 3 or less from your graveyard to the battlefield.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl+cmcLE3,Artifact.YouCtrl+cmcLE3
+SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouOwn+cmcLE3,Artifact.YouOwn+cmcLE3 | TgtPrompt$ Select target artifact or creature with mana value 3 or less
 S:Mode$ Continuous | Affected$ Creature.cmcLE3+YouCtrl | AddPower$ 1 | Description$ Creatures you control with mana value 3 or less get +1/+0.
 DeckHas:Ability$Graveyard
 DeckHints:Type$Artifact
diff --git a/forge-gui/res/cardsfolder/upcoming/persistent_behemoth.txt b/forge-gui/res/cardsfolder/upcoming/persistent_behemoth.txt
index 892b8c0d2ef..9e8f4a631a9 100644
--- a/forge-gui/res/cardsfolder/upcoming/persistent_behemoth.txt
+++ b/forge-gui/res/cardsfolder/upcoming/persistent_behemoth.txt
@@ -2,8 +2,8 @@ Name:Persistent Behemoth
 ManaCost:5
 Types:Artifact Creature Beast
 PT:5/3
-S:Mode$ Continuous | Affected$ Land.YouCtrl | MayPlay$ True | AffectedZone$ Graveyard | Description$ You may play lands from your graveyard.
+S:Mode$ Continuous | Affected$ Land.YouOwn | MayPlay$ True | AffectedZone$ Graveyard | Description$ You may play lands from your graveyard.
 K:Unearth:G G
 DeckHas:Ability$Graveyard
-DeckHints:Ability$Mill|Landfall & Color$Green
+DeckHints:Ability$Mill & Color$Green
 Oracle:You may play land cards from your graveyard.\nUnearth {G}{G} ({G}{G}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/tocasias_digsite.txt b/forge-gui/res/cardsfolder/upcoming/tocasias_digsite.txt
index 299da9b212d..84df33e1424 100644
--- a/forge-gui/res/cardsfolder/upcoming/tocasias_digsite.txt
+++ b/forge-gui/res/cardsfolder/upcoming/tocasias_digsite.txt
@@ -1,7 +1,7 @@
 Name:Tocasia's Digsite
 ManaCost:no cost
 Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Surveil | Cost$ 3 T | Amount$ 1 | SpellDescription$ Surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
 DeckHas:Ability$Graveyard
-Oracle:{T}: Add {C}.\n{3}, {T}: Surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
+Oracle:{T}: Add {C}.\n{3}, {T}: Surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
\ No newline at end of file