diff --git a/forge-gui/res/cardsfolder/b/baloth_cage_trap.txt b/forge-gui/res/cardsfolder/b/baloth_cage_trap.txt
index 8375afed39d..60bba45afdd 100644
--- a/forge-gui/res/cardsfolder/b/baloth_cage_trap.txt
+++ b/forge-gui/res/cardsfolder/b/baloth_cage_trap.txt
@@ -1,7 +1,7 @@
 Name:Baloth Cage Trap
 ManaCost:3 G G
 Types:Instant Trap
-SVar:AltCost:Cost$ 1 G | CheckSVar$ ArtifactsEntered | References$ ArtifactsEntered | StackDescription$ Description | Description$ If an opponent had an artifact enter the battlefield under their control this turn, you may pay {1}{G} rather than pay CARDNAME's mana cost.
-A:SP$ Token | Cost$ 3 G G | TokenAmount$ 1 | TokenScript$ g_4_4_beast | TokenOwner$ You | SpellDescription$ Create a 4/4 green Beast creature token.
+SVar:AltCost:Cost$ 1 G | CheckSVar$ ArtifactsEntered | References$ ArtifactsEntered | Description$ If an opponent had an artifact enter the battlefield under their control this turn, you may pay {1}{G} rather than pay CARDNAME's mana cost.
+A:SP$ Token | Cost$ 3 G G | TokenAmount$ 1 | TokenScript$ g_4_4_beast | TokenOwner$ You | StackDescription$ {p:You} creates a 4/4 green Beast creature token. | SpellDescription$ Create a 4/4 green Beast creature token.
 SVar:ArtifactsEntered:Count$ThisTurnEntered_Battlefield_Artifact.OppCtrl
 Oracle:If an opponent had an artifact enter the battlefield under their control this turn, you may pay {1}{G} rather than pay Baloth Cage Trap's mana cost.\nCreate a 4/4 green Beast creature token.
diff --git a/forge-gui/res/cardsfolder/b/blazing_shoal.txt b/forge-gui/res/cardsfolder/b/blazing_shoal.txt
index e38b5c2b034..98d0afd2348 100644
--- a/forge-gui/res/cardsfolder/b/blazing_shoal.txt
+++ b/forge-gui/res/cardsfolder/b/blazing_shoal.txt
@@ -5,5 +5,6 @@ SVar:AltCost:Cost$ ExileFromHand<1/Card.Red> | Description$ You may exile a red
 A:SP$ Pump | Cost$ X R R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +Z | References$ X,Y,Z | SpellDescription$ Target creature gets +X/+0 until end of turn.
 SVar:X:Count$xPaid
 SVar:Y:Exiled$CardManaCost
+SVar:Z:SVar$Y/Plus.X
 AI:RemoveDeck:All
 Oracle:You may exile a red card with converted mana cost X from your hand rather than pay this spell's mana cost.\nTarget creature gets +X/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/c/cobra_trap.txt b/forge-gui/res/cardsfolder/c/cobra_trap.txt
index c0109cd2a3c..4d350a44d08 100644
--- a/forge-gui/res/cardsfolder/c/cobra_trap.txt
+++ b/forge-gui/res/cardsfolder/c/cobra_trap.txt
@@ -2,11 +2,10 @@ Name:Cobra Trap
 ManaCost:4 G G
 Types:Instant Trap
 T:Mode$ Destroyed | ValidCauser$ Player.Opponent | ValidCard$ Permanent.nonCreature+YouCtrl | Execute$ TrackValidDestroy | Static$ True
-SVar:TrackValidDestroy:DB$ StoreSVar | SVar$ SetTrap | Type$ CountSVar | Expression$ SetTrap/Plus.1 | References$ SetTrap
-T:Mode$ Phase | Phase$ Cleanup | Execute$ TrigReset | Static$ True
-SVar:TrigReset:DB$ StoreSVar | SVar$ SetTrap | Type$ Number | Expression$ 0 | References$ SetSVar
-SVar:SetTrap:Number$0
-SVar:AltCost:Cost$ G | CheckSVar$ SetTrap | SVarCompare$ GE1 | References$ SetTrap | Description$ If a noncreature permanent under your control was destroyed this turn by a spell or ability an opponent controlled, you may pay {G} rather than pay CARDNAME's mana cost.
-A:SP$ Token | Cost$ 4 G G | TokenAmount$ 4 | TokenScript$ g_1_1_snake | TokenOwner$ You | LegacyImage$ g 1 1 snake zen | SpellDescription$ Create four 1/1 green Snake creature tokens.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/cobra_trap.jpg
+SVar:TrackValidDestroy:DB$ Pump | RememberObjects$ TriggeredCard
+T:Mode$ TurnBegin | Execute$ TrigReset | Static$ True
+SVar:TrigReset:DB$ Cleanup | ClearRemembered$ True
+SVar:SetTrap:Remembered$Amount
+SVar:AltCost:Cost$ G | CheckSVar$ SetTrap | References$ SetTrap | Description$ If a noncreature permanent under your control was destroyed this turn by a spell or ability an opponent controlled, you may pay {G} rather than pay CARDNAME's mana cost.
+A:SP$ Token | Cost$ 4 G G | TokenAmount$ 4 | TokenScript$ g_1_1_snake | TokenOwner$ You | StackDescription$ {p:You} creates four 1/1 green Snake creature tokens. | SpellDescription$ Create four 1/1 green Snake creature tokens.
 Oracle:If a noncreature permanent under your control was destroyed this turn by a spell or ability an opponent controlled, you may pay {G} rather than pay this spell's mana cost.\nCreate four 1/1 green Snake creature tokens.