diff --git a/forge-gui/res/cardsfolder/upcoming/churning_reservoir.txt b/forge-gui/res/cardsfolder/upcoming/churning_reservoir.txt
index bbad72fcad7..1f6ab49d3d6 100644
--- a/forge-gui/res/cardsfolder/upcoming/churning_reservoir.txt
+++ b/forge-gui/res/cardsfolder/upcoming/churning_reservoir.txt
@@ -4,6 +4,6 @@ Types:Artifact
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, put an oil counter on another target nontoken artifact or creature you control.
 SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Artifact.nonToken+YouCtrl+Other,Creature.YouCtrl+Other | CounterType$ OIL| CounterNum$ 1
 A:AB$ Token | Cost$ 2 T | TokenScript$ r_1_1_phyrexian_goblin | CheckSVar$ CountCountersRemoved | CheckSVarCompare$ GE1 | SpellDescription$ Create a 1/1 red Phyrexian Goblin creature token. Activate only if an oil counter was removed from a permanent you controlled this turn or a permanent with an oil counter on it was put into a graveyard this turn.
-SVar:CountCountersRemoved:Count$Valid CountersRemovedThisTurn
+SVar:CountCountersRemoved:Count$CountersRemovedThisTurn OIL Card.YouCtrl
 DeckHas:Ability$Token/Counters & Type$Goblin|Phyrexian
-Oracle:At the beginning of your upkeep, put an oil counter on another target nontoken artifact or creature you control.\n{2}, {T}: Create a 1/1 red Phyrexian Goblin creature token. Activate only if an oil counter was removed from a permanent you controlled this turn or a permanent with an oil counter on it was put into a graveyard this turn.
+Oracle:At the beginning of your upkeep, put an oil counter on another target nontoken artifact or creature you control.\n{2}, {T}: Create a 1/1 red Phyrexian Goblin creature token. Activate only if an oil counter was removed from a permanent you controlled this turn or a permanent with an oil counter on it was put into a graveyard this turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/goliath_hatchery.txt b/forge-gui/res/cardsfolder/upcoming/goliath_hatchery.txt
index 78f5cd0269c..08aaa348bdf 100644
--- a/forge-gui/res/cardsfolder/upcoming/goliath_hatchery.txt
+++ b/forge-gui/res/cardsfolder/upcoming/goliath_hatchery.txt
@@ -5,9 +5,10 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ g_3_3_phyrexian_beast_toxic
 T:Mode$ Phase | Phase$ Upkeep  | TriggerZones$ Battlefield | ValidPlayer$ You | Execute$ TrigChooseCard | CheckSVar$ X | SVarCompare$ GE3 | TriggerDescription$ Corrupted — At the beginning of your upkeep, if an opponent has three or more poison counters, choose a creature you control, then draw cards equal to its total toxic value.
 SVar:TrigChooseCard:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Creature.YouCtrl | SubAbility$ DBDraw
-SVar:DBDraw:DB$ Draw | NumCards$ AffectedX
+SVar:DBDraw:DB$ Draw | NumCards$ AffectedX | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 SVar:X:PlayerCountOpponents$HighestPoisonCounters
-SVar:AffectedX:Count$Valid ChosenCard$TotalValue Toxic
+SVar:AffectedX:Count$Valid Card.ChosenCard$TotalValue Toxic
 DeckHas:Ability$Token & Type$Beast|Phyrexian
 DeckHints:Keyword$Toxic|Infect
 Oracle:When Goliath Hatchery enters the battlefield, create two 3/3 green Phyrexian Beast creature tokens with toxic 1. (Players dealt combat damage by them also get a poison counter.)\nCorrupted — At the beginning of your upkeep, if an opponent has three or more poison counters, choose a creature you control, then draw cards equal to its total toxic value.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/ichor_synthesizer.txt b/forge-gui/res/cardsfolder/upcoming/ichor_synthesizer.txt
index 20031fa96b1..914f6efbc41 100644
--- a/forge-gui/res/cardsfolder/upcoming/ichor_synthesizer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ichor_synthesizer.txt
@@ -5,7 +5,7 @@ PT:1/3
 T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a noncreature spell, put an oil counter on CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | CounterType$ OIL
 S:Mode$ Continuous | Affected$ Card.Self+counters_GE4_OIL | AddPower$ 2 | Description$ As long as CARDNAME has four or more oil counters on it, it gets +2/+0 and can't be blocked.
-S:Mode$ CantBlockBy | ValidAttacker$ Card.Self | 
+S:Mode$ CantBlockBy | ValidAttacker$ Card.Self | Description$ CARDNAME can't be blocked.
 SVar:BuffedBy:Card.nonCreature
 DeckHas:Ability$Counters
 Oracle:Whenever you cast a noncreature spell, put an oil counter on Ichor Synthesizer.\nAs long as Ichor Synthesizer has four or more oil counters on it, it gets +2/+0 and can't be blocked.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/predation_steward.txt b/forge-gui/res/cardsfolder/upcoming/predation_steward.txt
index 5729059cfd7..9f9c3de565b 100644
--- a/forge-gui/res/cardsfolder/upcoming/predation_steward.txt
+++ b/forge-gui/res/cardsfolder/upcoming/predation_steward.txt
@@ -3,6 +3,6 @@ ManaCost:1 G
 Types:Creature Phyrexian Elf Warrior
 PT:2/2
 K:etbCounter:OIL:2
-A:AB$ Pump | Cost$ 2 G T SubCounter<1/OIL> | ValidTgts$ Creature | SorcerySpeed | NumAtt$ 2 | NumDef$ 2 | SpellDescription$ Target creature gets +2/+2 until end of turn. Activate only as a sorcery.
+A:AB$ Pump | Cost$ 2 G T SubCounter<1/OIL> | ValidTgts$ Creature | SorcerySpeed$ True | NumAtt$ 2 | NumDef$ 2 | SpellDescription$ Target creature gets +2/+2 until end of turn. Activate only as a sorcery.
 DeckHas:Ability$Counter
 Oracle:Predation Steward enters the battlefield with two oil counters on it.\n{2}{G}, {T}, Remove an oil counter from Predation Steward: Target creature gets +2/+2 until end of turn. Activate only as a sorcery.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/serum_core_chimera.txt b/forge-gui/res/cardsfolder/upcoming/serum_core_chimera.txt
index 3f110ec1fd7..07b0b8cc283 100644
--- a/forge-gui/res/cardsfolder/upcoming/serum_core_chimera.txt
+++ b/forge-gui/res/cardsfolder/upcoming/serum_core_chimera.txt
@@ -7,7 +7,8 @@ T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | T
 SVar:TrigCounter:DB$ PutCounter | Defined$ Self | CounterType$ OIL | CounterNum$ 1
 A:AB$ Draw | Cost$ SubCounter<3/OIL> | SorcerySpeed$ True | SubAbility$ DBDiscard | SpellDescription$ Draw a card. Then you may discard a nonland card. When you discard a card this way, CARDNAME deals 3 damage to target creature or planeswalker. Activate only as a sorcery.
 SVar:DBDiscard:DB$ Discard | NumCards$ 1 | Mode$ TgtChoose | RememberDiscarded$ True | SubAbility$ DBImmediateTrig
-SVar:DBImmediateTrig:DB$ ImmediateTrigger | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ TrigDamage | TriggerDescription$  When you discard a card this way, CARDNAME deals 3 damage to target creature or planeswalker.
+SVar:DBImmediateTrig:DB$ ImmediateTrigger | ConditionDefined$ Remembered | ConditionPresent$ Card | Execute$ TrigDamage | SubAbility$ DBCleanup | TriggerDescription$  When you discard a card this way, CARDNAME deals 3 damage to target creature or planeswalker.
 SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | NumDmg$ 3
-DeckHas:Ability$Counters
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+DeckHas:Ability$Counters|Discard
 Oracle:Flying\nWhenever you cast a noncreature spell, put an oil counter on Serum-Core Chimera.\nRemove three oil counters from Serum-Core Chimera: Draw a card. Then you may discard a nonland card. When you discard a card this way, Serum-Core Chimera deals 3 damage to target creature or planeswalker. Activate only as a sorcery.
\ No newline at end of file