diff --git a/forge-gui/res/cardsfolder/upcoming/forgefire_automaton.txt b/forge-gui/res/cardsfolder/upcoming/forgefire_automaton.txt
index 6df365d1a5b..79527615f3f 100644
--- a/forge-gui/res/cardsfolder/upcoming/forgefire_automaton.txt
+++ b/forge-gui/res/cardsfolder/upcoming/forgefire_automaton.txt
@@ -6,8 +6,7 @@ K:Prototype:2 B:3:2
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigReturn | TriggerDescription$ At the beginning of your upkeep, return target creature card with power less than CARDNAME's power from your graveyard to the battlefield. Its base power perpetually becomes equal to CARDNAME's Power
 SVar:TrigReturn:DB$ ChangeZone |  ValidTgts$ Creature.powerLTX+YouOwn | RememberChanged$ True | TgtPrompt$ Select target creature card with lesser power | Origin$ Graveyard | Destination$ Battlefield | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | Name$ Forgefire Automaton's Perpetual Effect | RememberObjects$ Remembered | StaticAbilities$ PerpetualStatic | Duration$ Permanent
-SVar:PerpetualStatic:Mode$ Continuous | Affected$ Card.IsRemembered | SetPower$ Y | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ The base power of this card perpetually becomes equal to Forgefire Automaton's Power
+SVar:PerpetualStatic:Mode$ Continuous | Affected$ Card.IsRemembered | SetPower$ X | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ The base power of this card perpetually becomes equal to Forgefire Automaton's Power
 SVar:X:TriggeredCard$CardPower
-SVar:Y:Count$CardPower
 DeckHints:Ability$Graveyard|Discard|Mill & Color$Black
 Oracle:Prototype {2}{B} — 3/2 (You may cast this spell with different mana cost, color, and size. It keeps its abilities and types.)\nAt the beginning of your upkeep, return target creature card with power less than Forgefire Automaton's power from your graveyard to the battlefield.\nIts base power perpetually becomes equal to Forgefire Automaton's Power
diff --git a/forge-gui/res/cardsfolder/upcoming/great_desert_hellion.txt b/forge-gui/res/cardsfolder/upcoming/great_desert_hellion.txt
index 400cdbd5036..8302bb895fa 100644
--- a/forge-gui/res/cardsfolder/upcoming/great_desert_hellion.txt
+++ b/forge-gui/res/cardsfolder/upcoming/great_desert_hellion.txt
@@ -4,14 +4,14 @@ Types:Creature Hellion
 PT:5/5
 K:Starting intensity:1
 K:Menace
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigDiscard | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, sacrifice CARDNAME unless you discard a card. If you discard a card this way, perpetually increase Great CARDNAME's intensity by 1.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigDiscard | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, sacrifice CARDNAME unless you discard a card. If you discard a card this way, perpetually increase CARDNAME's intensity by 1.
 SVar:TrigDiscard:DB$ Discard | Defined$ You | Mode$ TgtChoose | NumCards$ 1 | Optional$ True | RememberDiscarded$ True | SubAbility$ DBSacrifice
 SVar:DBSacrifice:DB$ Sacrifice | Defined$ Self | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ EQ0 | SubAbility$ DBIncrease
 SVar:DBIncrease:DB$ Intensify | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigDiscardBis | TriggerDescription$ When CARDNAME leaves the battlefield, you may discard your hand. If you do, Draw cards equal to CARDNAME's intensity. 
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigDiscardBis | TriggerDescription$ When CARDNAME leaves the battlefield, you may discard your hand. If you do, draw cards equal to CARDNAME's intensity. 
 SVar:TrigDiscardBis:DB$ Discard | Optional$ True | Mode$ Hand | Defined$ You | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ X
-SVar:X:TriggeredCard$Intensity
+SVar:X:Count$Intensity
 DeckHas:Ability$Discard|Sacrifice
-Oracle:Starting intensity 1\nMenace\nAt the beginning of your upkeep, sacrifice Great Desert Hellion unless you discard a card. If you discard a card this way, perpetually increase Great Desert Hellion's intensity by 1.\nWhen Great Desert Hellion leaves the battlefield, you may discard your hand. If you do, Draw cards equal to Great Desert Hellion's intensity. 
\ No newline at end of file
+Oracle:Starting intensity 1\nMenace\nAt the beginning of your upkeep, sacrifice Great Desert Hellion unless you discard a card. If you discard a card this way, perpetually increase Great Desert Hellion's intensity by 1.\nWhen Great Desert Hellion leaves the battlefield, you may discard your hand. If you do, draw cards equal to Great Desert Hellion's intensity. 
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/penregon_besieged.txt b/forge-gui/res/cardsfolder/upcoming/penregon_besieged.txt
index a6ada4c3a3c..32aeecfb25d 100644
--- a/forge-gui/res/cardsfolder/upcoming/penregon_besieged.txt
+++ b/forge-gui/res/cardsfolder/upcoming/penregon_besieged.txt
@@ -2,7 +2,7 @@ Name:Penregon Besieged
 ManaCost:1 B
 Types:Enchantment
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChoose | TriggerDescription$ At the beginning of your end step, choose a creature with the least toughness among creatures your opponents control. It perpetually gets -1/-1.
-SVar:TrigChoose:DB$ ChooseCard | Choices$ Creature.leastToughness+OppCtrl | ChoiceTitle$ Choose a creature with the least toughness among creatures your opponents control |  Mandatory$ True | SubAbility$ DBEffect
+SVar:TrigChoose:DB$ ChooseCard | Choices$ Creature.leastToughness+OppCtrl | ChoiceTitle$ Choose a creature with the least toughness among creatures your opponents control | Mandatory$ True | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | StaticAbilities$ PerpetualDebuff | Name$ Penregon Besieged's Perpetual Effect | Duration$ Permanent
 SVar:PerpetualDebuff:Mode$ Continuous | Affected$ Card.ChosenCard | AddPower$ -1 | AddToughness$ -1 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually gets -1/-1.
 T:Mode$ Always | TriggerZones$ Battlefield | IsPresent$ Creature.OppCtrl | PresentCompare$ EQ0 | Execute$ TrigSac | TriggerDescription$ When your opponents control no creatures, sacrifice CARDNAME.