diff --git a/forge-gui/res/cardsfolder/upcoming/scour_the_scene.txt b/forge-gui/res/cardsfolder/upcoming/scour_the_scene.txt
index f16fe30c1e1..7b952f5c774 100644
--- a/forge-gui/res/cardsfolder/upcoming/scour_the_scene.txt
+++ b/forge-gui/res/cardsfolder/upcoming/scour_the_scene.txt
@@ -4,9 +4,9 @@ Types:Enchantment
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 2/2 white and blue Detective creature token.
 SVar:TrigToken:DB$ Token | TokenScript$ wu_2_2_detective
 T:Mode$ Sacrificed | ValidCard$ Artifact | ValidPlayer$ You | Execute$ TrigChooseCard | TriggerZones$ Battlefield | TriggerDescription$ Whenever you sacrifice an artifact, choose a creature card in your hand or a creature you control. It perpetually gets +1/+0.
-SVar:TrigChooseCard:DB$ ChooseCard | ChoiceZone$ Hand,Battlefield | ChoiceTitle$ Choose a creature card in your hand or a creature you control | Mandatory$ True | Choices$ Creature.YouOwn | SubAbility$ DBPump
+SVar:TrigChooseCard:DB$ ChooseCard | ChoiceZone$ Hand,Battlefield | ChoiceTitle$ Choose a creature card in your hand or a creature you control | Mandatory$ True | Choices$ Creature.YouCtrl | SubAbility$ DBPump
 SVar:DBPump:DB$ Pump | PumpZone$ Hand,Battlefield | Defined$ ChosenCard | NumAtt$ 1 | Duration$ Perpetual | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
-DeckHas:Ability$Token
+DeckHas:Ability$Token & Type$Detective
 DeckHints:Type$Artifact
 Oracle:When Scour the Scene enters the battlefield, create a 2/2 white and blue Detective creature token.\nWhenever you sacrifice an artifact, choose a creature card in your hand or a creature you control. It perpetually gets +1/+0.
diff --git a/forge-gui/res/cardsfolder/upcoming/snarlfang_vermin.txt b/forge-gui/res/cardsfolder/upcoming/snarlfang_vermin.txt
index c8915611a41..bbaa40ee697 100644
--- a/forge-gui/res/cardsfolder/upcoming/snarlfang_vermin.txt
+++ b/forge-gui/res/cardsfolder/upcoming/snarlfang_vermin.txt
@@ -3,10 +3,10 @@ ManaCost:B
 Types:Creature Rat
 PT:2/1
 T:Mode$ DamageDone | CombatDamage$ True | ValidSource$ Card.Self | ValidTarget$ Creature | TriggerZones$ Battlefield | Execute$ TrigSuspect | TriggerDescription$ Whenever CARDNAME deals combat damage to a creature, if that creature is still on the battlefield, suspect that creature. It perpetually gains this ability.
-SVar:TrigSuspect:DB$ AlterAttribute | Defined$ TriggeredTargetLKICopy | RememberAltered$ True | Attributes$ Suspected | SubAbility$ DBAnimate
+SVar:TrigSuspect:DB$ AlterAttribute | Defined$ TriggeredTargetLKICopy | ConditionDefined$ TriggeredTargetLKICopy | ConditionPresent$ Card.InZoneBattlefield | RememberAltered$ True | Attributes$ Suspected | SubAbility$ DBAnimate
 SVar:DBAnimate:DB$ Animate | Defined$ Remembered | Triggers$ CombatTrig | Duration$ Perpetual | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:CombatTrig:Mode$ DamageDone | CombatDamage$ True | ValidSource$ Card.Self | ValidTarget$ Creature | TriggerZones$ Battlefield | Execute$ TrigSuspect | TriggerDescription$ Whenever CARDNAME deals combat damage to a creature, if that creature is still on the battlefield, suspect that creature. It perpetually gains this ability.
-T:Mode$ ChangesZone | Origin$ Battlefield | PresentZone$ Graveyard | IsPresent$ Card.StrictlySelf | TriggerZones$ Graveyard | Destination$ Graveyard | ValidCard$ Creature.OppCtrl+IsSuspected | Execute$ TrigLoseLife | TriggerDescription$ Whenever a suspected creature an opponent controls dies while Snarlfang Vermin is in your graveyard, that opponent loses 1 life.
+T:Mode$ ChangesZone | Origin$ Battlefield | PresentZone$ Graveyard | IsPresent$ Card.StrictlySelf | TriggerZones$ Graveyard | Destination$ Graveyard | ValidCard$ Creature.OppCtrl+IsSuspected | Execute$ TrigLoseLife | TriggerDescription$ Whenever a suspected creature an opponent controls dies while CARDNAME is in your graveyard, that opponent loses 1 life.
 SVar:TrigLoseLife:DB$ LoseLife | LifeAmount$ 1 | Defined$ TriggeredCardController
 Oracle:Whenever Snarlfang Vermin deals combat damage to a creature, if that creature is still on the battlefield, suspect that creature. It perpetually gains this ability.\nWhenever a suspected creature an opponent controls dies while Snarlfang Vermin is in your graveyard, that opponent loses 1 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/sproutwatch_dryad.txt b/forge-gui/res/cardsfolder/upcoming/sproutwatch_dryad.txt
index 581b24f264e..39291e43bf4 100644
--- a/forge-gui/res/cardsfolder/upcoming/sproutwatch_dryad.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sproutwatch_dryad.txt
@@ -2,7 +2,7 @@ Name:Sproutwatch Dryad
 ManaCost:1 G G
 Types:Creature Dryad
 PT:2/3
-T:Mode$ Phase | Phase$ BeginCombat | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ At the beginning of each combat, Sproutwatch Dryad gains flying until end of turn if a creature you control or a card in your hand has flying. The same is true for first strike, double strike, deathtouch, haste, hexproof, indestructible, lifelink, menace, reach, trample, and vigilance.
-SVar:TrigPump:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ First Strike & Flying & Deathtouch & Double Strike & Haste & Hexproof & Indestructible & Lifelink & Menace & Reach & Trample & Vigilance | SharedKeywordsZone$ Hand | SharedRestrictions$ Creature.YouOwn
+T:Mode$ Phase | Phase$ BeginCombat | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ At the beginning of each combat, CARDNAME gains flying until end of turn if a creature you control or a card in your hand has flying. The same is true for first strike, double strike, deathtouch, haste, hexproof, indestructible, lifelink, menace, reach, trample, and vigilance.
+SVar:TrigPump:DB$ PumpAll | ValidCards$ Card.Self | KW$ First Strike & Flying & Deathtouch & Double Strike & Haste & Hexproof & Indestructible & Lifelink & Menace & Reach & Trample & Vigilance | SharedKeywordsZone$ Hand | SharedRestrictions$ Creature.YouOwn
 DeckHas:Ability$LifeGain
 Oracle:At the beginning of each combat, Sproutwatch Dryad gains flying until end of turn if a creature you control or a card in your hand has flying. The same is true for first strike, double strike, deathtouch, haste, hexproof, indestructible, lifelink, menace, reach, trample, and vigilance.
diff --git a/forge-gui/res/cardsfolder/upcoming/tought_string_analyst.txt b/forge-gui/res/cardsfolder/upcoming/thought_string_analyst.txt
similarity index 97%
rename from forge-gui/res/cardsfolder/upcoming/tought_string_analyst.txt
rename to forge-gui/res/cardsfolder/upcoming/thought_string_analyst.txt
index 09e41b0cfd2..f55ba937036 100644
--- a/forge-gui/res/cardsfolder/upcoming/tought_string_analyst.txt
+++ b/forge-gui/res/cardsfolder/upcoming/thought_string_analyst.txt
@@ -5,7 +5,7 @@ PT:2/2
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigDig | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, exile the top card of target opponent's library face down. You lose life equal to its mana value. You may look at and play that card for as long as it remains exiled, and mana of any type can be spent to cast that spell.
 SVar:TrigDig:DB$ Dig | DigNum$ 1 | Defined$ Targeted | ValidTgts$ Opponent | ChangeNum$ All | DestinationZone$ Exile | ExileFaceDown$ True | RememberChanged$ True | SubAbility$ DBLoseLife
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ X | SubAbility$ DBEffect
-SVar:X:Targeted$CardManaCost
+SVar:X:Remembered$CardManaCost
 SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ STPlay | SubAbility$ DBCleanup | ForgetOnMoved$ Exile | Duration$ Permanent
 SVar:STPlay:Mode$ Continuous | MayLookAt$ You | MayPlay$ True | MayPlayIgnoreType$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play that card for as long as it remains exiled, and mana of any type can be spent to cast it.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/upcoming/veko_deaths_doorkeeper.txt b/forge-gui/res/cardsfolder/upcoming/veko_deaths_doorkeeper.txt
index 9573401a56c..84056ff4819 100644
--- a/forge-gui/res/cardsfolder/upcoming/veko_deaths_doorkeeper.txt
+++ b/forge-gui/res/cardsfolder/upcoming/veko_deaths_doorkeeper.txt
@@ -3,9 +3,8 @@ ManaCost:W B
 Types:Legendary Creature Spirit Cleric
 PT:1/3
 K:Extort
-A:AB$ ChangeZone | Cost$ Sac<1/Creature.nonSpirit/nonspirit creature> | RememberChanged$ True | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouOwn | Origin$ Graveyard | Destination$ Hand | SorcerySpeed$ True | SubAbility$ DBAnimate | AILogic$ SacAndRetFromGrave | SpellDescription$ Return target creature card from your graveyard to your hand. It perpetually becomes a Spirit, has base power and toughness 1/1, and gains "You may pay {W/B} rather than pay this spell's mana cost." Activate only as a sorcery.
-SVar:DBAnimate:DB$ Animate | Types$ Spirit | Defined$ Remembered | Power$ 1 | staticAbilities$ PerpAltCost | Toughness$ 1 |Duration$ Perpetual | SubAbility$ DBCleanup
-SVar:PerpAltCost:Mode$ Continuous | EffectZone$ All | MayPlay$ True | MayPlayAltManaCost$ WB | MayPlayDontGrantZonePermissions$ True | Affected$ Card.Self | AffectedZone$ Hand,Graveyard,Library,Exile,Command | Description$ "You may pay {W/B} rather than pay this spell’s mana cost." 
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-DeckHas:Ability$Graveyard|LifeGain
+A:AB$ ChangeZone | Cost$ Sac<1/Creature.nonSpirit/nonspirit creature> | AnimateSubAbilty$ DBAnimate | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouOwn | Origin$ Graveyard | Destination$ Hand | SorcerySpeed$ True | AILogic$ SacAndRetFromGrave | SpellDescription$ Return target creature card from your graveyard to your hand. It perpetually becomes a Spirit, has base power and toughness 1/1, and gains "You may pay {W/B} rather than pay this spell's mana cost." Activate only as a sorcery.
+SVar:DBAnimate:DB$ Animate | Types$ Spirit | Defined$ Remembered | Power$ 1 | staticAbilities$ PerpAltCost | Toughness$ 1 | Duration$ Perpetual
+SVar:PerpAltCost:Mode$ Continuous | EffectZone$ All | MayPlay$ True | MayPlayAltManaCost$ WB | MayPlayDontGrantZonePermissions$ True | Affected$ Card.Self | AffectedZone$ Hand,Graveyard,Library,Exile,Command | Description$ "You may pay {W/B} rather than pay this spell's mana cost." 
+DeckHas:Ability$Graveyard|LifeGain|Sacrifice
 Oracle:Extort\n{T}, Sacrifice a non-Spirit creature: Return target creature card from your graveyard to your hand. It perpetually becomes a Spirit, has base power and toughness 1/1, and gains "You may pay {W/B} rather than pay this spell's mana cost." Activate only as a sorcery.