diff --git a/forge-gui/res/cardsfolder/upcoming/bazaar_trademage.txt b/forge-gui/res/cardsfolder/upcoming/bazaar_trademage.txt
index f701975d1e0..55920fe8b2b 100644
--- a/forge-gui/res/cardsfolder/upcoming/bazaar_trademage.txt
+++ b/forge-gui/res/cardsfolder/upcoming/bazaar_trademage.txt
@@ -3,7 +3,7 @@ ManaCost:2 U
 Types:Creature Human Wizard
 K:Flying
 PT:3/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, create four 1/1 green Squirrel creature tokens.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw two cards, then discard three cards.
 SVar:TrigDraw:DB$ Draw | NumCards$ 2 | SpellDescription$ Draw two cards, then discard three cards. | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 3 | Mode$ TgtChoose
 AI:RemoveDeck:All
diff --git a/forge-gui/res/cardsfolder/upcoming/feaster_of_fools.txt b/forge-gui/res/cardsfolder/upcoming/feaster_of_fools.txt
index 14022e7855e..1a97e521368 100644
--- a/forge-gui/res/cardsfolder/upcoming/feaster_of_fools.txt
+++ b/forge-gui/res/cardsfolder/upcoming/feaster_of_fools.txt
@@ -5,4 +5,4 @@ PT:3/3
 K:Convoke
 K:Flying
 K:Devour:2
-Oracle:Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spells pays for 1 or one mana of that creature's color.) \nFlying \nDevour 2 (As this enters the battlefield, you may sacrifice any number of creatures. This creature entersthe battlefield with twice that many +1/+1 counters on it.) 
\ No newline at end of file
+Oracle:Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spells pays for 1 or one mana of that creature's color.)\nFlying\nDevour 2 (As this enters the battlefield, you may sacrifice any number of creatures. This creature entersthe battlefield with twice that many +1/+1 counters on it.) 
diff --git a/forge-gui/res/cardsfolder/upcoming/fiery_islet.txt b/forge-gui/res/cardsfolder/upcoming/fiery_islet.txt
index d9d51721a0a..885e4e53047 100644
--- a/forge-gui/res/cardsfolder/upcoming/fiery_islet.txt
+++ b/forge-gui/res/cardsfolder/upcoming/fiery_islet.txt
@@ -1,5 +1,5 @@
 Name:Fiery Islet
-ManaCost:
+ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T PayLife<1> | Produced$ U | SpellDescription$ Add {U}.
 A:AB$ Mana | Cost$ T PayLife<1> | Produced$ R | SpellDescription$ Add {R}.
diff --git a/forge-gui/res/cardsfolder/upcoming/fists_of_flame.txt b/forge-gui/res/cardsfolder/upcoming/fists_of_flame.txt
index 6b47d099aec..72482fab240 100644
--- a/forge-gui/res/cardsfolder/upcoming/fists_of_flame.txt
+++ b/forge-gui/res/cardsfolder/upcoming/fists_of_flame.txt
@@ -2,6 +2,6 @@ Name:Fists of Flame
 ManaCost:1 R
 Types:Instant
 A:SP$ Draw | Cost$ 1 R | NumCards$ 1 | SubAbility$ DBPump | SpellDescription$ Draw a card. Until end of turn, target creature gains trample and gets +1/+0 for each card you've drawn this turn.
-SVar:DBPump:DB$Pump | Defined$ Targeted | NumAtt$ +X | References$ X
+SVar:DBPump:DB$ Pump | ValidTgts$ Creature | KW$ Trample | NumAtt$ +X | References$ X
 SVar:X:Count$YouDrewThisTurn
 Oracle:Draw a card. Until end of turn, target creature gains trample and gets +1/+0 for each card you've drawn this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/good_fortune_unicorn.txt b/forge-gui/res/cardsfolder/upcoming/good_fortune_unicorn.txt
index fc29d20bd86..75229939b4d 100644
--- a/forge-gui/res/cardsfolder/upcoming/good_fortune_unicorn.txt
+++ b/forge-gui/res/cardsfolder/upcoming/good_fortune_unicorn.txt
@@ -4,4 +4,5 @@ Types:Creature Unicorn
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another creature enters the battlefield under your control, put a +1/+1 counter on that creature. 
 SVar:TrigPutCounter:DB$PutCounter | Defined$ TriggeredCardLKICopy | CounterType$ P1P1 | CounterNum$ 1
+DeckHas:Ability$Counters
 Oracle:Whenever another creature enters the battlefield under your control, put a +1/+1 counter on that creature. 
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/mother_bear.txt b/forge-gui/res/cardsfolder/upcoming/mother_bear.txt
index e2e5e9f99ba..8762087ca63 100644
--- a/forge-gui/res/cardsfolder/upcoming/mother_bear.txt
+++ b/forge-gui/res/cardsfolder/upcoming/mother_bear.txt
@@ -2,6 +2,6 @@ Name:Mother Bear
 ManaCost:1 G
 Types:Creature Bear
 PT:2/2
-A:AB$ Token | Cost$ 3 G G ExileFromGrave<1/CARDNAME> | ActivationZone$ Graveyard | SorcerySpeed$ True | TokenAmount$ 2 | TokenScript$ g_2_2_bear | TokenOwner$ You | LegacyImage$ g 2 2 bear mh1 | TokenKeywords$ Flying | SpellDescription$ Create two 2/2 green Bear creature tokens. Activate this ability only any time you could cast a sorcery.
+A:AB$ Token | Cost$ 3 G G ExileFromGrave<1/CARDNAME> | ActivationZone$ Graveyard | SorcerySpeed$ True | TokenAmount$ 2 | TokenScript$ g_2_2_bear | TokenOwner$ You | LegacyImage$ g 2 2 bear mh1 | SpellDescription$ Create two 2/2 green Bear creature tokens. Activate this ability only any time you could cast a sorcery.
 DeckHas:Ability$Token
 Oracle:{3}{G}{G}, Exile Mother Bear from your graveyard: Create two 2/2 green Bear creature tokens. Activate this ability only any time you could cast a sorcery. 
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/nurturing_peatland.txt b/forge-gui/res/cardsfolder/upcoming/nurturing_peatland.txt
index 7c04bc2c1ef..b04cfcbeefe 100644
--- a/forge-gui/res/cardsfolder/upcoming/nurturing_peatland.txt
+++ b/forge-gui/res/cardsfolder/upcoming/nurturing_peatland.txt
@@ -1,5 +1,5 @@
 Name:Nurturing Peatland
-ManaCost:
+ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T PayLife<1> | Produced$ B | SpellDescription$ Add {B}.
 A:AB$ Mana | Cost$ T PayLife<1> | Produced$ G | SpellDescription$ Add {G}.
diff --git a/forge-gui/res/cardsfolder/upcoming/prismatic_vista.txt b/forge-gui/res/cardsfolder/upcoming/prismatic_vista.txt
index c97a3e2baf5..f928ed83f5a 100644
--- a/forge-gui/res/cardsfolder/upcoming/prismatic_vista.txt
+++ b/forge-gui/res/cardsfolder/upcoming/prismatic_vista.txt
@@ -1,5 +1,5 @@
 Name:Prismatic Vista
-ManaCost:
+ManaCost:no cost
 Types:Land
 A:AB$ ChangeZone | Cost$ T PayLife<1> Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, put it onto the battlefield, then shuffle your library.
 Oracle:{T}, Pay 1 life, Sacrifice Prismatic View: Search your library for a basic land card, put it onto the battlefield, then shuffle your library.
diff --git a/forge-gui/res/cardsfolder/upcoming/seasoned_pyromancer.txt b/forge-gui/res/cardsfolder/upcoming/seasoned_pyromancer.txt
index 15ed39d12e1..1d3761c226e 100644
--- a/forge-gui/res/cardsfolder/upcoming/seasoned_pyromancer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/seasoned_pyromancer.txt
@@ -10,4 +10,4 @@ SVar:X:Remembered$Valid Card.nonLand
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 A:AB$ Token | Cost$ 3 R R ExileFromGrave<1/CARDNAME> | ActivationZone$ Graveyard | TokenAmount$ 2 | TokenScript$ r_1_1_elemental | TokenOwner$ You | LegacyImage$ r 1 1 elemental mh1 | SpellDescription$ Create two 1/1 red Elemental creature tokens.
 SVar:AIPreference:ExileFromGraveCost$Card.Self
-Oracle:When Seasoned Pyromancer enters the battlefield, discard two cards, then draw two cards. For each nonland card discarded this way, create a 1/1 red Elemental creature token.\n{3}{R}{R}, Exile Seasoned Pyromancer from your graveyard: Create two 1/1 red Elemental creature tokens.
\ No newline at end of file
+Oracle:When Seasoned Pyromancer enters the battlefield, discard two cards, then draw two cards. For each nonland card discarded this way, create a 1/1 red Elemental creature token.\n{3}{R}{R}, Exile Seasoned Pyromancer from your graveyard: Create two 1/1 red Elemental creature tokens.
diff --git a/forge-gui/res/cardsfolder/upcoming/silent_clearing.txt b/forge-gui/res/cardsfolder/upcoming/silent_clearing.txt
index 12c986b9c7b..0077dc15c62 100644
--- a/forge-gui/res/cardsfolder/upcoming/silent_clearing.txt
+++ b/forge-gui/res/cardsfolder/upcoming/silent_clearing.txt
@@ -1,5 +1,5 @@
 Name:Silent Clearing
-ManaCost:
+ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T PayLife<1> | Produced$ W | SpellDescription$ Add {W}.
 A:AB$ Mana | Cost$ T PayLife<1> | Produced$ B | SpellDescription$ Add {B}.
diff --git a/forge-gui/res/cardsfolder/upcoming/sunbaked_canyon.txt b/forge-gui/res/cardsfolder/upcoming/sunbaked_canyon.txt
index 3d228722035..067a542ba55 100644
--- a/forge-gui/res/cardsfolder/upcoming/sunbaked_canyon.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sunbaked_canyon.txt
@@ -1,5 +1,5 @@
 Name:Sunbaked Canyon
-ManaCost:
+ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T PayLife<1> | Produced$ W | SpellDescription$ Add {W}.
 A:AB$ Mana | Cost$ T PayLife<1> | Produced$ R | SpellDescription$ Add {R}.
diff --git a/forge-gui/res/cardsfolder/upcoming/umezawas_charm.txt b/forge-gui/res/cardsfolder/upcoming/umezawas_charm.txt
index 9663dda7db1..1b37c098dd2 100644
--- a/forge-gui/res/cardsfolder/upcoming/umezawas_charm.txt
+++ b/forge-gui/res/cardsfolder/upcoming/umezawas_charm.txt
@@ -5,5 +5,5 @@ A:SP$ Charm | Cost$ 1 B | Choices$ CharmPump,CharmCurse,CharmLife | Defined$ You
 SVar:CharmPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ Target creature gets +2/+2 until end of turn.
 SVar:CharmCurse:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | SpellDescription$ Target creature gets -1/-1 until end of turn.
 SVar:CharmLife:DB$ GainLife | LifeAmount$ 2 | SpellDescription$ You gain 2 life.
-DeckHas:Ability$Counters & Ability$LifeGain
-Oracle:Choose one -\nTarget creature gets +2/+2 until end of turn.\nTarget creature gets -1/-1 until end of turn.\nYou gain 2 life. 
\ No newline at end of file
+DeckHas:Ability$LifeGain
+Oracle:Choose one -\nTarget creature gets +2/+2 until end of turn.\nTarget creature gets -1/-1 until end of turn.\nYou gain 2 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/waterlogged_grove.txt b/forge-gui/res/cardsfolder/upcoming/waterlogged_grove.txt
index d4f1ab3736c..12ac8afe447 100644
--- a/forge-gui/res/cardsfolder/upcoming/waterlogged_grove.txt
+++ b/forge-gui/res/cardsfolder/upcoming/waterlogged_grove.txt
@@ -1,5 +1,5 @@
 Name:Waterlogged Grove
-ManaCost:
+ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T PayLife<1> | Produced$ U | SpellDescription$ Add {U}.
 A:AB$ Mana | Cost$ T PayLife<1> | Produced$ G | SpellDescription$ Add {G}.