diff --git a/forge-gui/res/cardsfolder/p/pine_walker.txt b/forge-gui/res/cardsfolder/p/pine_walker.txt
index e95f68a0c15..411d63e352e 100644
--- a/forge-gui/res/cardsfolder/p/pine_walker.txt
+++ b/forge-gui/res/cardsfolder/p/pine_walker.txt
@@ -3,7 +3,6 @@ ManaCost:3 G G
 Types:Creature Elemental
 PT:5/5
 K:Morph:4 G
-T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigUntap | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME or another creature you control is turned face up, untap that creature.
-T:Mode$ TurnFaceUp | ValidCard$ Creature.Other+YouCtrl | Execute$ TrigUntap | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another creature you control is turned face up, untap that creature.
+T:Mode$ TurnFaceUp | ValidCard$ Card.Self,Creature.Other+YouCtrl | Execute$ TrigUntap | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME or another creature you control is turned face up, untap that creature.
 SVar:TrigUntap:DB$ Untap | Defined$ TriggeredCard
 Oracle:Morph {4}{G} (You may cast this card face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)\nWhenever Pine Walker or another creature you control is turned face up, untap that creature.
diff --git a/forge-gui/res/cardsfolder/upcoming/officious_interrogation.txt b/forge-gui/res/cardsfolder/upcoming/officious_interrogation.txt
index 1c1540ff0a5..5755db0e769 100644
--- a/forge-gui/res/cardsfolder/upcoming/officious_interrogation.txt
+++ b/forge-gui/res/cardsfolder/upcoming/officious_interrogation.txt
@@ -1,11 +1,11 @@
 Name:Officious Interrogation
 ManaCost:W U
 Types:Instant
-S:Mode$ RaiseCost | ValidCard$ Card.Self | Type$ Spell | Amount$ IncreaseCost | Relative$ True | Cost$ WU | EffectZone$ All | Description$ This spell costs {W}{U} more to cast for each target beyond the first.
+S:Mode$ RaiseCost | ValidCard$ Card.Self | Type$ Spell | Amount$ IncreaseCost | Relative$ True | Cost$ W U | EffectZone$ All | Description$ This spell costs {W}{U} more to cast for each target beyond the first.
 SVar:IncreaseCost:TargetedObjects$Amount/Minus.1
-A:SP$ Pump | ValidTgts$ Player | TargetMin$ 0 | TargetMax$ MaxPlayer | SubAbility$ DBInvestigate | SpellDescription$ Choose any number of target players
+A:SP$ Pump | ValidTgts$ Player | TargetMin$ 0 | TargetMax$ MaxPlayer | SubAbility$ DBInvestigate | SpellDescription$ Choose any number of target players.
 SVar:DBInvestigate:DB$ Investigate | Num$ X | SpellDescription$ Investigate X times, where X is the total number of creatures those players control.
 SVar:MaxPlayer:PlayerCountPlayers$Amount
 SVar:X:Count$Valid Creature.TargetedPlayerCtrl
 DeckHas:Ability$Token & Type$Artifact|Clue
-Oracle:This spell costs {W}{U} more to cast for each target beyond the first.\nChoose any number of target players. Investigate X times, where X is the total number of creatures those players control
+Oracle:This spell costs {W}{U} more to cast for each target beyond the first.\nChoose any number of target players. Investigate X times, where X is the total number of creatures those players control.
diff --git a/forge-gui/res/cardsfolder/upcoming/pyrotechnic_performer.txt b/forge-gui/res/cardsfolder/upcoming/pyrotechnic_performer.txt
index 37c9a3be764..8c768ebc8ec 100644
--- a/forge-gui/res/cardsfolder/upcoming/pyrotechnic_performer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/pyrotechnic_performer.txt
@@ -3,8 +3,7 @@ ManaCost:1 R
 Types:Creature Viashino Assassin
 PT:3/2
 K:Disguise:R
-T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME or another creature you control is turned face up, that creature deals damage equal to its power to each opponent.
-T:Mode$ TurnFaceUp | ValidCard$ Creature.Other+YouCtrl | Execute$ TrigDealDamage | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another creature you control is turned face up, that creature deals damage equal to its power to each opponent.
+T:Mode$ TurnFaceUp | ValidCard$ Card.Self,Creature.Other+YouCtrl | Execute$ TrigDealDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME or another creature you control is turned face up, that creature deals damage equal to its power to each opponent.
 SVar:TrigDealDamage:DB$ DealDamage | Defined$ Opponent | NumDmg$ X | DamageSource$ TriggeredCard 
 SVar:X:TriggeredCard$CardPower
 Oracle:Disguise {R} (You may cast this card face down for {3} as a 2/2 creature with ward {2}. Turn it face up any time for its disguise cost.)\nWhenever Pyrotechnic Performer or another creature you control is turned face up, that creature deals damage equal to its power to each opponent.
diff --git a/forge-gui/res/cardsfolder/upcoming/sanctuary_wall.txt b/forge-gui/res/cardsfolder/upcoming/sanctuary_wall.txt
index 6c4b48ba7a8..f6fd626bd73 100644
--- a/forge-gui/res/cardsfolder/upcoming/sanctuary_wall.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sanctuary_wall.txt
@@ -3,7 +3,7 @@ ManaCost:1 W
 Types:Artifact Creature Wall
 PT:0/4
 K:Defender
-A:AB$ Tap | Cost$ 2 W T | ValidTgts$ Creature |  SubAbility$ DBCounter | SpellDescription$ Tap target creature. You may put a stun counter on it. If you do, put a stun counter on Sanctuary Wall. (If a permanent with a stun counter would become untapped, remove one from it instead.)
+A:AB$ Tap | Cost$ 2 W T | ValidTgts$ Creature |  SubAbility$ DBCounter | SpellDescription$ Tap target creature. You may put a stun counter on it. If you do, put a stun counter on CARDNAME. (If a permanent with a stun counter would become untapped, remove one from it instead.)
 SVar:DBCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ Stun | CounterNum$ 1 | Optional$ True | RememberPut$ True | SubAbility$ DBCounterSelf
 SVar:DBCounterSelf:DB$ PutCounter | Defined$ Self | CounterNum$ 1 | CounterType$ Stun | ConditionDefined$ Remembered | ConditionPresent$ GE1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True 
diff --git a/forge-gui/res/cardsfolder/upcoming/soul_enervation.txt b/forge-gui/res/cardsfolder/upcoming/soul_enervation.txt
index c776767a237..0b3f9bdd13b 100644
--- a/forge-gui/res/cardsfolder/upcoming/soul_enervation.txt
+++ b/forge-gui/res/cardsfolder/upcoming/soul_enervation.txt
@@ -4,8 +4,8 @@ Types:Enchantment
 K:Flash
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target creature gets -4/-4 until end of turn.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | NumAtt$ -4 | NumDef$ -4 | IsCurse$ True
-T:Mode$ ChangesZoneAll | ValidCards$ Card.YouOwn | Origin$ Graveyard | Destination$ Any | TriggerZones$ Battlefield | Execute$ LoseGain | TriggerDescription$ Whenever one or more creature cards leave your graveyard, each opponent loses 1 life and you gain 1 life.
-SVar:LoseGain:DB$ LoseLife | ValidTgts$ Opponent | LifeAmount$ 1 | SubAbility$ DBGain
+T:Mode$ ChangesZoneAll | ValidCards$ Creature.YouOwn | Origin$ Graveyard | Destination$ Any | TriggerZones$ Battlefield | Execute$ LoseGain | TriggerDescription$ Whenever one or more creature cards leave your graveyard, each opponent loses 1 life and you gain 1 life.
+SVar:LoseGain:DB$ LoseLife | Defined$ Opponent | LifeAmount$ 1 | SubAbility$ DBGain
 SVar:DBGain:DB$ GainLife | Defined$ You | LifeAmount$ 1
 DeckHas:Ability$LifeGain
 DeckHints:Ability$Graveyard
diff --git a/forge-gui/res/cardsfolder/upcoming/steamcore_scholar.txt b/forge-gui/res/cardsfolder/upcoming/steamcore_scholar.txt
index e40310a67fe..008bb403ed4 100644
--- a/forge-gui/res/cardsfolder/upcoming/steamcore_scholar.txt
+++ b/forge-gui/res/cardsfolder/upcoming/steamcore_scholar.txt
@@ -2,11 +2,11 @@ Name:Steamcore Scholar
 ManaCost:2 U
 Types:Creature Weird Detective
 PT:2/2
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDraw | TriggerDescription$When CARDNAME enters the battlefield, draw two cards. Then discard two cards unless you discard an instant or sorcery card or a creature card with flying.
-SVar:TrigDraw:DB$ Draw | NumCards$ 2 | SubAbility$ DBDiscard
-SVar:DBDiscard:DB$ Discard | NumCards$ 2 | Mode$ TgtChoose | UnlessType$ Creature.withFlying,Instant,Sorcery
 K:Flying
 K:Vigilance
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw two cards. Then discard two cards unless you discard an instant or sorcery card or a creature card with flying.
+SVar:TrigDraw:DB$ Draw | NumCards$ 2 | SubAbility$ DBDiscard
+SVar:DBDiscard:DB$ Discard | NumCards$ 2 | Mode$ TgtChoose | UnlessType$ Creature.withFlying,Instant,Sorcery
 DeckHas:Ability$Discard
 DeckHints:Type$Instant|Sorcery
 Oracle:Flying, vigilance\nWhen CARDNAME enters the battlefield, draw two cards. Then discard two cards unless you discard an instant or sorcery card or a creature card with flying.
diff --git a/forge-gui/res/cardsfolder/upcoming/tenth_district_hero.txt b/forge-gui/res/cardsfolder/upcoming/tenth_district_hero.txt
index 0533e0955d5..a5ee5de2ee2 100644
--- a/forge-gui/res/cardsfolder/upcoming/tenth_district_hero.txt
+++ b/forge-gui/res/cardsfolder/upcoming/tenth_district_hero.txt
@@ -3,8 +3,8 @@ ManaCost:1 W
 Types:Creature Human
 PT:2/3
 A:AB$ Animate | Cost$ 1 W CollectEvidence<2>  | Types$ Human,Detective | RemoveCreatureTypes$ True | Duration$ Permanent | Power$ 4 | Toughness$ 4 | Keywords$ Vigilance | SpellDescription$ CARDNAME becomes a Human Detective with base power and toughness 4/4 and gains vigilance.
-A:AB$ Animate | Cost$ 2 W CollectEvidence<4> | staticAbilities$ Static | ConditionPresent$ Card.Self+Detective | Types$ Legendary,Creature | Name$ Mileva, the Stalwart | Power$ 5 | Toughness$ 6 | Duration$ Permanent | RemoveCreatureTypes$ True | Duration$ Permanent | Power$ 4 | Toughness$ 4 | SpellDescription$ If CARDNAME is a Detective, it becomes a legendary creature named Mileva, the Stalwart, it has base power and toughness 5/5, and it gains "Other creatures you control have indestructible."
-SVar:Static:Mode$ Continuous | Affected$ Permanent.Other+YouCtrl | AddKeyword$ Indestructible | Description$ Other creatures you control have indestructible.
+A:AB$ Animate | Cost$ 2 W CollectEvidence<4> | staticAbilities$ Static | ConditionPresent$ Card.Self+Detective | Types$ Legendary,Creature | Name$ Mileva, the Stalwart | Power$ 5 | Toughness$ 5 | Duration$ Permanent | RemoveCreatureTypes$ True | Duration$ Permanent | SpellDescription$ If CARDNAME is a Detective, it becomes a legendary creature named Mileva, the Stalwart, it has base power and toughness 5/5, and it gains "Other creatures you control have indestructible."
+SVar:Static:Mode$ Continuous | Affected$ Creature.Other+YouCtrl | AddKeyword$ Indestructible | Description$ Other creatures you control have indestructible.
 DeckHints:Ability$Graveyard|Mill|Discard|Dredge
 DeckHas:Type$Detective
 Oracle:{1}{W}, Collect evidence 2: Tenth District Hero becomes a Human Detective with base power and toughness 4/4 and gains vigilance.\n{2}{W}, Collect evidence 4: If Tenth District Hero is a Detective, it becomes a legendary creature named Mileva, the Stalwart, it has base power and toughness 5/5, and it gains "Other creatures you control have indestructible."
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/unyielding_gatekeeper.txt b/forge-gui/res/cardsfolder/upcoming/unyielding_gatekeeper.txt
index 5bbc8f94ee6..288111253a4 100644
--- a/forge-gui/res/cardsfolder/upcoming/unyielding_gatekeeper.txt
+++ b/forge-gui/res/cardsfolder/upcoming/unyielding_gatekeeper.txt
@@ -4,9 +4,9 @@ Types:Creature Elephant Cleric
 PT:3/2
 K:Disguise:1 W
 T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME is turned face up, exile another target nonland permanent. If you controlled it, return it to the battlefield tapped. Otherwise, its controller creates a 2/2 white and blue Detective creature token.
-SVar:TrigExile:DB$ ChangeZone | IsCurse$ True | ValidTgts$ Creature.Other | TgtPrompt$ Choose another target creature | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DBReturn
-SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | ConditionDefined$ Remembered | ConditionPresent$ Card.YouOwn | Destination$ Battlefield | SubAbility$ DBToken | StackDescription$ then return it to the battlefield under its owner's control.
-SVar:DBToken:DB$ Token | TokenScript$ wu_2_2_detective | TokenOwner$ RememberedController | ConditionDefined$ Remembered | ConditionPresent$ Card.YouOwn | ConditionCompare$ EQ0 | SubAbility$ DBCleanup |
+SVar:TrigExile:DB$ ChangeZone | IsCurse$ True | ValidTgts$ Creature.Other | TgtPrompt$ Choose another target creature | Origin$ Battlefield | Destination$ Exile | RememberLKI$ True | SubAbility$ DBReturn
+SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | ConditionDefined$ Remembered | ConditionPresent$ Card.YouCtrl | Destination$ Battlefield | SubAbility$ DBToken 
+SVar:DBToken:DB$ Token | TokenScript$ wu_2_2_detective | TokenOwner$ RememberedController | ConditionDefined$ Remembered | ConditionPresent$ Card.YouCtrl | ConditionCompare$ EQ0 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHas:Ability$Token & Type$Detective & Color$Blue
 Oracle:Disguise {1}{W} (You may cast this card face down for {3} as a 2/2 creature with ward {2}. Turn it face up any time for its disguise cost.)\nWhen Unyielding Gatekeeper is turned face up, exile another target nonland permanent. If you controlled it, return it to the battlefield tapped. Otherwise, its controller creates a 2/2 white and blue Detective creature token.