diff --git a/forge-gui/res/cardsfolder/a/archangel_of_strife.txt b/forge-gui/res/cardsfolder/a/archangel_of_strife.txt
index a9bde07ae90..af85918e41e 100644
--- a/forge-gui/res/cardsfolder/a/archangel_of_strife.txt
+++ b/forge-gui/res/cardsfolder/a/archangel_of_strife.txt
@@ -8,8 +8,8 @@ SVar:ChooseEach:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBCho
 SVar:DBChoice:DB$ GenericChoice | Defined$ Player.IsRemembered | Choices$ WarChoice,PeaceChoice
 SVar:WarChoice:DB$ Pump | Defined$ Player.IsRemembered | NoteCards$ Self | NoteCardsFor$ Strife | SpellDescription$ War
 SVar:PeaceChoice:DB$ Pump | Defined$ Player.IsRemembered | ClearNotedCardsFor$ Strife | SpellDescription$ Peace
-SVar:DBRemember:DB$ Pump | RememberObjects$ Player.NotedForStrife
+SVar:DBRemember:DB$ Pump | RememberObjects$ Player.NotedForStrife | ImprintCards$ Self
 S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Creature.ControlledBy Remembered | AddPower$ 3 | Description$ Creatures controlled by players who chose war get +3/+0.
-S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Creature.!ControlledBy Remembered | AddToughness$ 3 | Description$ Creatures controlled by players who chose peace get +0/+3.
+S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Creature.!ControlledBy Remembered | AddToughness$ 3 | IsPresent$ Card.IsImprinted | Description$ Creatures controlled by players who chose peace get +0/+3.
 AI:RemoveDeck:Random
 Oracle:Flying\nAs Archangel of Strife enters the battlefield, each player chooses war or peace.\nCreatures controlled by players who chose war get +3/+0.\nCreatures controlled by players who chose peace get +0/+3.
diff --git a/forge-gui/res/cardsfolder/h/hoarders_greed.txt b/forge-gui/res/cardsfolder/h/hoarders_greed.txt
index 6797be6a83c..a9d31c44931 100644
--- a/forge-gui/res/cardsfolder/h/hoarders_greed.txt
+++ b/forge-gui/res/cardsfolder/h/hoarders_greed.txt
@@ -1,10 +1,10 @@
 Name:Hoarder's Greed
 ManaCost:3 B
 Types:Sorcery
-A:SP$ Repeat | Cost$ 3 B | RepeatCheckSVar$ CheckRepeat | RepeatSVarCompare$ GT0 | RepeatSubAbility$ DBLoseLife | SubAbility$ DBReset | StackDescription$ SpellDescription | SpellDescription$ You lose 2 life and draw two cards, then clash with an opponent. If you win, repeat this process.
+A:SP$ Repeat | Cost$ 3 B | RepeatCheckSVar$ CheckRepeat | RepeatSVarCompare$ GT0 | RepeatSubAbility$ DBLoseLife | StackDescription$ SpellDescription | SpellDescription$ You lose 2 life and draw two cards, then clash with an opponent. If you win, repeat this process.
 SVar:DBLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ 2 | SubAbility$ DBDraw | SpellDescription$ You lose 2 life and draw two cards, then clash with an opponent. If you win, repeat this process.
 SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 2 | SubAbility$ DBClash
-SVar:DBClash:DB$ Clash | LoseSubAbility$ DBStoreSVar
+SVar:DBClash:DB$ Clash | WinSubAbility$ DBStoreSVar | OtherwiseSubAbility$ DBReset
 SVar:DBStoreSVar:DB$ StoreSVar | SVar$ CheckRepeat | Type$ Number | Expression$ 1
 SVar:DBReset:DB$ StoreSVar | SVar$ CheckRepeat | Type$ Number | Expression$ 0
 SVar:CheckRepeat:Number$0
diff --git a/forge-gui/res/cardsfolder/s/sirens_ruse.txt b/forge-gui/res/cardsfolder/s/sirens_ruse.txt
index 4219db9170d..ad061e509ac 100644
--- a/forge-gui/res/cardsfolder/s/sirens_ruse.txt
+++ b/forge-gui/res/cardsfolder/s/sirens_ruse.txt
@@ -4,7 +4,7 @@ Types:Instant
 A:SP$ Pump | Cost$ 1 U | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | RememberObjects$ Targeted | SubAbility$ DBRememberPirate | SpellDescription$ Exile target creature you control, then return that card to the battlefield under its owner's control. If a Pirate was exiled this way, draw a card. | StackDescription$ SpellDescription
 SVar:DBRememberPirate:DB$ StoreSVar | SVar$ WasPirate | Type$ Number | Expression$ 1 | ConditionDefined$ Remembered | ConditionPresent$ Card.Pirate | ConditionCompare$ EQ1 | SubAbility$ DBChangeZone
 SVar:DBChangeZone:DB$ ChangeZone | Defined$ ParentTarget | Origin$ Battlefield | Destination$ Exile | ForgetOtherRemembered$ True | RememberChanged$ True | SubAbility$ DBReturn
-SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ All | Destination$ Battlefield | GainControl$ True | SubAbility$ DBPirateDraw
+SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ All | Destination$ Battlefield | SubAbility$ DBPirateDraw
 SVar:DBPirateDraw:DB$ Draw | NumCards$ 1 | ConditionCheckSVar$ WasPirate | ConditionSVarCompare$ EQ1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | SubAbility$ DBReinitialize
 SVar:DBReinitialize:DB$ StoreSVar | SVar$ WasPirate | Type$ Number | Expression$ 0
diff --git a/forge-gui/res/cardsfolder/t/tezzeret_betrayer_of_flesh.txt b/forge-gui/res/cardsfolder/t/tezzeret_betrayer_of_flesh.txt
index d496969394a..40d666582ff 100644
--- a/forge-gui/res/cardsfolder/t/tezzeret_betrayer_of_flesh.txt
+++ b/forge-gui/res/cardsfolder/t/tezzeret_betrayer_of_flesh.txt
@@ -2,11 +2,11 @@ Name:Tezzeret, Betrayer of Flesh
 ManaCost:2 U U
 Types:Legendary Planeswalker Tezzeret
 Loyalty:4
-T:Mode$ AbilityCast | ValidActivatingPlayer$ You | ValidCard$ Artifact | Static$ True | CheckSVar$ ArtAct | SVarCompare$ NE1 | Execute$ TrigStore
-SVar:TrigStore:DB$ Pump | NoteNumber$ 1
+T:Mode$ AbilityCast | ValidCard$ Artifact | Static$ True | CheckSVar$ ArtAct | SVarCompare$ NE1 | Execute$ TrigStore
+SVar:TrigStore:DB$ Pump | Defined$ TriggeredActivator | NoteNumber$ 1
 SVar:ArtAct:Count$NotedNumber
 T:Mode$ TurnBegin | Execute$ TrigReset | Static$ True
-SVar:TrigReset:DB$ Pump | NoteNumber$ 0
+SVar:TrigReset:DB$ Pump | Defined$ Player | NoteNumber$ 0
 S:Mode$ ReduceCost | ValidCard$ Artifact.YouCtrl | Type$ Ability | Amount$ 2 | CheckSVar$ ArtAct | SVarCompare$ NE1 | OnlyFirstActivation$ True | AffectedZone$ Battlefield | Description$ The first activated ability of an artifact you activate each turn costs {2} less to activate.
 A:AB$ Draw | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | NumCards$ 2 | SpellDescription$ Draw two cards. Then discard two cards unless you discard an artifact card. | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$ Discard | Defined$ You | NumCards$ 2 | Mode$ TgtChoose | UnlessType$ Artifact
diff --git a/forge-gui/res/cardsfolder/w/world_at_war.txt b/forge-gui/res/cardsfolder/w/world_at_war.txt
index 5938d4e33f0..62b05cfdebe 100644
--- a/forge-gui/res/cardsfolder/w/world_at_war.txt
+++ b/forge-gui/res/cardsfolder/w/world_at_war.txt
@@ -2,7 +2,7 @@ Name:World at War
 ManaCost:3 R R
 Types:Sorcery
 A:SP$ AddPhase | Cost$ 3 R R | ExtraPhase$ Combat | AfterPhase$ Main2 | FollowedBy$ Main2 | BeforeFirstPostCombatMainEnd$ True | ExtraPhaseDelayedTrigger$ DelTrigUntap | ExtraPhaseDelayedTriggerExcute$ TrigUntapAll | SpellDescription$ After the first postcombat main phase this turn, there's an additional combat phase followed by an additional main phase. At the beginning of that combat, untap all creatures that attacked this turn.
-SVar:DelTrigUntap:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerDescription$ At the beginning of that combat, untap all creatures that attacked this turn.
+SVar:DelTrigUntap:Mode$ Phase | Phase$ BeginCombat | TriggerDescription$ At the beginning of that combat, untap all creatures that attacked this turn.
 SVar:TrigUntapAll:DB$ UntapAll | ValidCards$ Creature.attackedThisTurn
 K:Rebound
 Oracle:After the first postcombat main phase this turn, there's an additional combat phase followed by an additional main phase. At the beginning of that combat, untap all creatures that attacked this turn.\nRebound (If you cast this spell from your hand, exile it as it resolves. At the beginning of your next upkeep, you may cast this card from exile without paying its mana cost.)