diff --git a/forge-gui/res/cardsfolder/d/druid_of_the_emerald_grove.txt b/forge-gui/res/cardsfolder/d/druid_of_the_emerald_grove.txt
index 2716b2a2514..e8507a039e9 100644
--- a/forge-gui/res/cardsfolder/d/druid_of_the_emerald_grove.txt
+++ b/forge-gui/res/cardsfolder/d/druid_of_the_emerald_grove.txt
@@ -4,10 +4,10 @@ Types:Creature Dwarf Druid
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, search your library for up to two basic land cards and reveal them, then ABILITY
 SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Hidden$ True | ChangeNum$ 2 | ChangeType$ Land.Basic | Destination$ Library | RememberChanged$ True | Reveal$ True | Shuffle$ False | SubAbility$ DBRollDice
-SVar:DBRollDice:DB$ RollDice | Sides$ 20 | ResultSubAbilities$ 1-9:TutuDaDome,10-19:WonTwoField,20:ToFourField | SpellDescription$ then roll a d20.
+SVar:DBRollDice:DB$ RollDice | Sides$ 20 | ResultSubAbilities$ 1-9:TutuDaDome,10-19:WonTwoField,Else:ToFourField | SpellDescription$ then roll a d20.
 SVar:TutuDaDome:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card.IsRemembered | ChangeNum$ 2 | SubAbility$ DBCleanup | SpellDescription$ 1-9 VERT Put those cards into your hand, then shuffle.
 SVar:WonTwoField:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Card.IsRemembered | ChangeNum$ 1 | ForgetChanged$ True | NoShuffle$ True | SubAbility$ WonTwoDome | SpellDescription$ 10-19 VERT Put one of those cards onto the battlefield tapped and the other into your hand, then shuffle.
 SVar:WonTwoDome:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card.IsRemembered | ChangeNum$ 1 | SubAbility$ DBCleanup
 SVar:ToFourField:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Card.IsRemembered | ChangeNum$ 2 | SubAbility$ DBCleanup | SpellDescription$ 20 VERT Put those cards onto the battlefield tapped, then shuffle.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-Oracle:When Druid of the Emerald Grove enters the battlefield, search your library for up to two basic land cards and reveal them, then roll a d20.\n1-9 | Put those cards into your hand, then shuffle.\n10-19 | Put one of those cards onto the battlefield tapped and the other into your hand, then shuffle.\n20 | Put those cards onto the battlefield tapped, then shuffle.
+Oracle:When Druid of the Emerald Grove enters the battlefield, search your library for up to two basic land cards and reveal them, then roll a d20.\n1-9 | Put those cards into your hand, then shuffle.\n10-19 | Put one of those cards onto the battlefield tapped and the other into your hand, then shuffle.\n20+ | Put those cards onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/j/jhoira_of_the_ghitu.txt b/forge-gui/res/cardsfolder/j/jhoira_of_the_ghitu.txt
index 2af1b0d546b..2bfe7de92dc 100644
--- a/forge-gui/res/cardsfolder/j/jhoira_of_the_ghitu.txt
+++ b/forge-gui/res/cardsfolder/j/jhoira_of_the_ghitu.txt
@@ -2,8 +2,7 @@ Name:Jhoira of the Ghitu
 ManaCost:1 U R
 Types:Legendary Creature Human Wizard
 PT:2/2
-A:AB$ PutCounter | Cost$ 2 ExileFromHand<1/Card.nonLand/nonland card> | CostDesc$ {2}, Exile a nonland card from your hand: | RememberCards$ True | Defined$ ExiledCards | CounterType$ TIME | CounterNum$ 4 | SubAbility$ GiveSuspend | TgtZone$ Exile | StackDescription$ Put four time counters on the exiled card. | SpellDescription$ Put four time counters on the exiled card. If it doesn't have suspend, it gains suspend. (At the beginning of your upkeep, remove a time counter from that card. When the last is removed, cast it without paying its mana cost. If it's a creature, it has haste.)
-SVar:GiveSuspend:DB$ PumpAll | ValidCards$ Card.IsRemembered+withoutSuspend | KW$ Suspend | PumpZone$ Exile | Duration$ Permanent | SubAbility$ DBCleanup | StackDescription$ If it doesn't have suspend, it gains suspend.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:AB$ PutCounter | Cost$ 2 ExileFromHand<1/Card.nonLand/nonland card> | CostDesc$ {2}, Exile a nonland card from your hand: | Defined$ ExiledCards | CounterType$ TIME | CounterNum$ 4 | SubAbility$ GiveSuspend | StackDescription$ Put four time counters on the exiled card. | SpellDescription$ Put four time counters on the exiled card. If it doesn't have suspend, it gains suspend. (At the beginning of your upkeep, remove a time counter from that card. When the last is removed, cast it without paying its mana cost. If it's a creature, it has haste.)
+SVar:GiveSuspend:DB$ Pump | Defined$ ExiledCards.withoutSuspend | KW$ Suspend | PumpZone$ Exile | Duration$ Permanent | StackDescription$ If it doesn't have suspend, it gains suspend.
 AI:RemoveDeck:All
 Oracle:{2}, Exile a nonland card from your hand: Put four time counters on the exiled card. If it doesn't have suspend, it gains suspend. (At the beginning of your upkeep, remove a time counter from that card. When the last is removed, cast it without paying its mana cost. If it's a creature, it has haste.)
diff --git a/forge-gui/res/cardsfolder/k/karn_liberated.txt b/forge-gui/res/cardsfolder/k/karn_liberated.txt
index 6b06e30f0c3..b198a95d5ca 100644
--- a/forge-gui/res/cardsfolder/k/karn_liberated.txt
+++ b/forge-gui/res/cardsfolder/k/karn_liberated.txt
@@ -5,5 +5,5 @@ Loyalty:6
 A:AB$ ChangeZone | Cost$ AddCounter<4/LOYALTY> | Planeswalker$ True | ValidTgts$ Player | TgtPrompt$ Select target player | Origin$ Hand | Destination$ Exile | ChangeType$ Card | ChangeNum$ 1 | Chooser$ Targeted | Hidden$ True | IsCurse$ True | Mandatory$ True | SpellDescription$ Target player exiles a card from their hand.
 A:AB$ ChangeZone | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target permanent.
 A:AB$ RestartGame | Cost$ SubCounter<14/LOYALTY> | Planeswalker$ True | Ultimate$ True | RestrictFromZone$ Exile | RestrictFromValid$ Card.!ExiledWithSource,Spell,Card.Aura | SubAbility$ ReturnFromExile | SpellDescription$ Restart the game, leaving in exile all non-Aura permanent cards exiled with CARDNAME. Then put those cards onto the battlefield under your control.
-SVar:ReturnFromExile:DB$ ChangeZoneAll | ChangeType$ Permanent.nonAura+ExiledWithSource | Origin$ Exile | Destination$ Battlefield | GainControl$ True | SubAbility$ DBCleanup
+SVar:ReturnFromExile:DB$ ChangeZoneAll | ChangeType$ Permanent.nonAura+ExiledWithSource | Origin$ Exile | Destination$ Battlefield | GainControl$ True
 Oracle:[+4]: Target player exiles a card from their hand.\n[-3]: Exile target permanent.\n[-14]: Restart the game, leaving in exile all non-Aura permanent cards exiled with Karn Liberated. Then put those cards onto the battlefield under your control.
diff --git a/forge-gui/res/cardsfolder/o/optimus_prime_hero_optimus_prime_autobot_leader.txt b/forge-gui/res/cardsfolder/o/optimus_prime_hero_optimus_prime_autobot_leader.txt
index 8431130fe39..29b09b9478d 100644
--- a/forge-gui/res/cardsfolder/o/optimus_prime_hero_optimus_prime_autobot_leader.txt
+++ b/forge-gui/res/cardsfolder/o/optimus_prime_hero_optimus_prime_autobot_leader.txt
@@ -21,7 +21,7 @@ PT:6/8
 K:Living metal
 K:Trample
 T:Mode$ AttackersDeclared | AttackingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigBolster | TriggerDescription$ Whenever you attack, bolster 2. The chosen creature gains trample until end of turn. When that creature deals combat damage to a player this turn, convert NICKNAME.
-SVar:TrigBolster:DB$ PutCounter | Bolster$ True | CounterType$ P1P1 | CounterNum$ 2 | RememberPut$ True | SubAbility$ DBPump
+SVar:TrigBolster:DB$ PutCounter | Bolster$ True | CounterType$ P1P1 | CounterNum$ 2 | RememberCards$ True | SubAbility$ DBPump
 SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ Trample | SubAbility$ DBDelayedTrigger
 SVar:DBDelayedTrigger:DB$ DelayedTrigger | Mode$ DamageDone | RememberObjects$ Remembered | ValidSource$ Card.IsTriggerRemembered | ValidTarget$ Player | CombatDamage$ True | ThisTurn$ True | Execute$ TrigConvert | TriggerDescription$ When that creature deals combat damage to a player this turn, convert NICKNAME.
 SVar:TrigConvert:DB$ SetState | Mode$ Transform | SubAbility$ DBCleanup
diff --git a/forge-gui/res/cardsfolder/p/pardic_dragon.txt b/forge-gui/res/cardsfolder/p/pardic_dragon.txt
index b14c8dae5c5..0f922b92be5 100644
--- a/forge-gui/res/cardsfolder/p/pardic_dragon.txt
+++ b/forge-gui/res/cardsfolder/p/pardic_dragon.txt
@@ -5,6 +5,6 @@ PT:4/4
 K:Flying
 K:Suspend:2:R R
 A:AB$ Pump | Cost$ R | Defined$ Self | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
-T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ Opponent | TriggerZones$ Exile | IsPresent$ Card.suspended+Self | PresentZone$ Exile | OptionalDecider$ Opponent | Execute$ TrigPutCounter | TriggerDescription$ Whenever an opponent casts a spell, if CARDNAME is suspended, that player may put a time counter on CARDNAME.
+T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ Opponent | TriggerZones$ Exile | IsPresent$ Card.suspended+Self | PresentZone$ Exile | OptionalDecider$ TriggeredActivator | Execute$ TrigPutCounter | TriggerDescription$ Whenever an opponent casts a spell, if CARDNAME is suspended, that player may put a time counter on CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ TIME | CounterNum$ 1
 Oracle:Flying\n{R}: Pardic Dragon gets +1/+0 until end of turn.\nSuspend 2—{R}{R}\nWhenever an opponent casts a spell, if Pardic Dragon is suspended, that player may put a time counter on Pardic Dragon.
diff --git a/forge-gui/res/cardsfolder/r/ruxa_patient_professor.txt b/forge-gui/res/cardsfolder/r/ruxa_patient_professor.txt
index 532862c6ed9..403ca43bed6 100644
--- a/forge-gui/res/cardsfolder/r/ruxa_patient_professor.txt
+++ b/forge-gui/res/cardsfolder/r/ruxa_patient_professor.txt
@@ -6,6 +6,6 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigChange | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, return target creature card with no abilities from your graveyard to your hand.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.NoAbilities+YouOwn
 S:Mode$ Continuous | Affected$ Creature.NoAbilities+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Creatures you control with no abilities get +1/+1.
-S:Mode$ AssignCombatDamageAsUnblocked | ValidCard$ Creature.NoAbilities+YouCtrl | Optional$ True | Description$ You may have creatures you control with no abilities assign their combat damage as though they weren't blocked.
+S:Mode$ AssignCombatDamageAsUnblocked | ValidCard$ Creature.NoAbilities+YouCtrl | Optional$ True | Description$ For each creature you control with no abilities, you may have that creature assign its combat damage as though it weren't blocked.
 SVar:HasAttackEffect:TRUE
-Oracle:Whenever Ruxa, Patient Professor enters the battlefield or attacks, return target creature card with no abilities from your graveyard to your hand.\nCreatures you control with no abilities get +1/+1.\nYou may have creatures you control with no abilities assign their combat damage as though they weren't blocked.
+Oracle:Whenever Ruxa, Patient Professor enters the battlefield or attacks, return target creature card with no abilities from your graveyard to your hand.\nCreatures you control with no abilities get +1/+1.\nFor each creature you control with no abilities, you may have that creature assign its combat damage as though it weren't blocked.
diff --git a/forge-gui/res/cardsfolder/upcoming/crown_of_gondor.txt b/forge-gui/res/cardsfolder/upcoming/crown_of_gondor.txt
index b21537940e9..cd7b630a5ce 100644
--- a/forge-gui/res/cardsfolder/upcoming/crown_of_gondor.txt
+++ b/forge-gui/res/cardsfolder/upcoming/crown_of_gondor.txt
@@ -3,7 +3,7 @@ ManaCost:3
 Types:Legendary Artifact Equipment
 K:Equip:4:::ReduceCost$ Monarch: This ability costs {3} less to activate if you're the monarch.
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ X | AddToughness$ X | Description$ Equipped creature gets +1/+1 for each creature you control.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Legendary+YouCtrl+cmcGE4 | CheckSVar$ NoMonarch | SVarCompare$ EQ0 | Execute$ TrigMonarch | TriggerDescription$ When a legendary creature enters the battlefield under your control, if there is no monarch, you become the monarch.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Legendary+YouCtrl+cmcGE4 | TriggerZones$ Battlefield | CheckSVar$ NoMonarch | SVarCompare$ EQ0 | Execute$ TrigMonarch | TriggerDescription$ When a legendary creature enters the battlefield under your control, if there is no monarch, you become the monarch.
 SVar:TrigMonarch:DB$ BecomeMonarch | Defined$ You
 SVar:X:Count$Valid Creature.YouCtrl
 SVar:Monarch:Count$Monarch.3.0
diff --git a/forge-gui/res/cardsfolder/upcoming/radagast_the_brown.txt b/forge-gui/res/cardsfolder/upcoming/radagast_the_brown.txt
index 1eb7e1e9a9e..f7420ece17d 100644
--- a/forge-gui/res/cardsfolder/upcoming/radagast_the_brown.txt
+++ b/forge-gui/res/cardsfolder/upcoming/radagast_the_brown.txt
@@ -3,6 +3,6 @@ ManaCost:2 G G
 Types:Legendary Creature Avatar Wizard
 PT:2/5
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl+nonToken,Card.Self | TriggerZones$ Battlefield | Execute$ TrigDig | TriggerDescription$ Whenever CARDNAME or another nontoken creature enters the battlefield under your control, look at the top X cards of your library, where X is that creature's mana value. You may reveal a creature card from among them that doesn't share a creature type with a creature you control and put it into your hand. Put the rest on the bottom of your library in a random order.
-SVar:TrigDig:DB$ Dig | DigNum$ X | ChangeNum$ 1 | Optional$ True | ChangeValid$ Card.Creature+!sharesCreatureTypeWith Valid Creature.YouCtrl | DestinationZone$ Hand | DestinationZone2$ Library | RestRandomOrder$ True
+SVar:TrigDig:DB$ Dig | DigNum$ X | ChangeNum$ 1 | Optional$ True| ForceRevealToController$ True | ChangeValid$ Card.Creature+!sharesCreatureTypeWith Valid Creature.YouCtrl | DestinationZone$ Hand | DestinationZone2$ Library | RestRandomOrder$ True
 SVar:X:TriggeredCard$CardManaCost
-Oracle:Whenever Radagast the Brown or another nontoken creature enters the battlefield under your control, look at the top X cards of your library, where X is that creature's mana value. You may reveal a creature card from among them that doesn’t share a creature type with a creature you control and put it into your hand. Put the rest on the bottom of your library in a random order.
+Oracle:Whenever Radagast the Brown or another nontoken creature enters the battlefield under your control, look at the top X cards of your library, where X is that creature's mana value. You may reveal a creature card from among them that doesn't share a creature type with a creature you control and put it into your hand. Put the rest on the bottom of your library in a random order.
diff --git a/forge-gui/res/tokenscripts/r_3_1_elemental_trample_haste.txt b/forge-gui/res/tokenscripts/r_3_1_elemental_trample_haste.txt
index c991f56f220..50e24c5e7a6 100644
--- a/forge-gui/res/tokenscripts/r_3_1_elemental_trample_haste.txt
+++ b/forge-gui/res/tokenscripts/r_3_1_elemental_trample_haste.txt
@@ -5,4 +5,4 @@ Colors:red
 PT:3/1
 K:Trample
 K:Haste
-Oracle:Trample, Haste
+Oracle:Trample, haste
diff --git a/forge-gui/res/tokenscripts/r_x_1_phyrexian_horror_trample_haste.txt b/forge-gui/res/tokenscripts/r_x_1_phyrexian_horror_trample_haste.txt
index 2e1fe5ca35d..42bde0cf335 100644
--- a/forge-gui/res/tokenscripts/r_x_1_phyrexian_horror_trample_haste.txt
+++ b/forge-gui/res/tokenscripts/r_x_1_phyrexian_horror_trample_haste.txt
@@ -5,4 +5,4 @@ Colors:red
 PT:*/1
 K:Trample
 K:Haste
-Oracle:Trample, Haste
+Oracle:Trample, haste