diff --git a/forge-gui/res/cardsfolder/upcoming/assemble_the_entmoot.txt b/forge-gui/res/cardsfolder/upcoming/assemble_the_entmoot.txt
index 9617df8a8a0..14868e2db65 100644
--- a/forge-gui/res/cardsfolder/upcoming/assemble_the_entmoot.txt
+++ b/forge-gui/res/cardsfolder/upcoming/assemble_the_entmoot.txt
@@ -2,7 +2,7 @@ Name:Assemble the Entmoot
 ManaCost:3 G
 Types:Enchantment
 S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddKeyword$ Reach | Description$ Creatures you control have reach.
-A:AB$ Token | Cost$ Sac<1/CARDNAME> | TokenAmount$ 3 | TokenScript$ g_x_x_treefolk | TokenPower$ X | TokenToughness$ X | RememberTokens$ True | SubAbility$ DBReach | SpellDescription$ Create three tapped X/X green Treefolk creature tokens, where X is the amount of life you gained this turn. Put a reach counter on each of them.
+A:AB$ Token | Cost$ Sac<1/CARDNAME> | TokenAmount$ 3 | TokenScript$ g_x_x_treefolk | TokenPower$ X | TokenToughness$ X | RememberTokens$ True | TokenTapped$ True | SubAbility$ DBReach | SpellDescription$ Create three tapped X/X green Treefolk creature tokens, where X is the amount of life you gained this turn. Put a reach counter on each of them.
 SVar:DBReach:DB$ PutCounter | Defined$ Remembered | CounterType$ Reach | CounterNum$ 1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:PlayMain1:TRUE
diff --git a/forge-gui/res/cardsfolder/upcoming/boromir_gondors_hope.txt b/forge-gui/res/cardsfolder/upcoming/boromir_gondors_hope.txt
index 6063515e382..2c963e2c3d0 100644
--- a/forge-gui/res/cardsfolder/upcoming/boromir_gondors_hope.txt
+++ b/forge-gui/res/cardsfolder/upcoming/boromir_gondors_hope.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Human Warrior
 PT:3/4
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDig | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, look at the top six cards of your library. You may reveal a Human or artifact card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDig | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, look at the top six cards of your library. You may reveal a Human or artifact card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
-SVar:TrigDig:DB$ Dig | DigNum$ 5 | ChangeNum$ 1 | Optional$ True | ForceRevealToController$ True | ChangeValid$ Human,Artifact | RestRandomOrder$ True
+SVar:TrigDig:DB$ Dig | DigNum$ 6 | ChangeNum$ 1 | Optional$ True | ForceRevealToController$ True | ChangeValid$ Human,Artifact | RestRandomOrder$ True
 DeckHints:Type$Human|Artifact
 SVar:HasAttackEffect:TRUE
 Oracle:Whenever Boromir, Gondor's Hope enters the battlefield or attacks, look at the top six cards of your library. You may reveal a Human or artifact card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/call_for_aid.txt b/forge-gui/res/cardsfolder/upcoming/call_for_aid.txt
index 0d25a246716..ecdd3094e39 100644
--- a/forge-gui/res/cardsfolder/upcoming/call_for_aid.txt
+++ b/forge-gui/res/cardsfolder/upcoming/call_for_aid.txt
@@ -1,10 +1,10 @@
 Name:Call for Aid
 ManaCost:4 R
 Types:Socery
-A:SP$ GainControl | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | AllValid$ Creature.TargetedPlayerCtrl | AddKWs$ Haste | Untap$ True | NewController$ You | LoseControl$ EOT | RememberControlled$ True | SubAbility$ DBEffect | SpellDescription$ Gain control of all creatures target opponent controls until end of turn. Untap those creatures.They gain haste until end of turn. You can't attack that player this turn. You can't sacrifice those creatures this turn.
+A:SP$ GainControl | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | AllValid$ Creature.TargetedPlayerCtrl | AddKWs$ Haste | Untap$ True | NewController$ You | LoseControl$ EOT | RememberControlled$ True | SubAbility$ DBEffect | SpellDescription$ Gain control of all creatures target opponent controls until end of turn. Untap those creatures. They gain haste until end of turn. You can't attack that player this turn. You can't sacrifice those creatures this turn.
 SVar:DBEffect:DB$ Effect | RememberObjects$ TargetedPlayer,RememberedCard | StaticAbilities$ CantSac,CantAttack | SubAbility$ DBCleanup
 SVar:CantSac:Mode$ CantSacrifice | ValidCard$ Card.IsRemembered+YouCtrl | Description$ You can't sacrifice those creatures this turn.
 SVar:CantAttack:Mode$ CantAttack | ValidCard$ Creature.YouCtrl | Target$ Player.IsRemembered | Description$ You can't attack that player this turn
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 AI:RemoveDeck:All
-Oracle:Gain control of all creatures target opponent controls until end of turn. Untap those creatures.They gain haste until end of turn. You can't attack that player this turn. You can't sacrifice those creatures this turn.
\ No newline at end of file
+Oracle:Gain control of all creatures target opponent controls until end of turn. Untap those creatures. They gain haste until end of turn. You can't attack that player this turn. You can't sacrifice those creatures this turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/champions_of_minas_tirith.txt b/forge-gui/res/cardsfolder/upcoming/champions_of_minas_tirith.txt
index 1638a6cca79..61ea40ae2da 100644
--- a/forge-gui/res/cardsfolder/upcoming/champions_of_minas_tirith.txt
+++ b/forge-gui/res/cardsfolder/upcoming/champions_of_minas_tirith.txt
@@ -4,9 +4,8 @@ Types:Creature Human Soldier
 PT:4/6
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMonarch | TriggerDescription$ When CARDNAME enters the battlefield, you become the monarch.
 SVar:TrigMonarch:DB$ BecomeMonarch | Defined$ You
-T:Mode$ Phase | Phase$ BeginCombat | TriggerZones$ Battlefield | ValidPlayer$ Opponent | CheckSVar$ Monarch | SVarCompare$ EQ1 | Execute$ TrigCantAttack | TriggerDescription$ At the beginning of combat on each opponent's turn, if you're the monarch, that opponent may pay {X}, where X is the number of cards in their hand. If they don't, they can't attack you this combat.
+T:Mode$ Phase | Phase$ BeginCombat | TriggerZones$ Battlefield | ValidPlayer$ Opponent | CheckDefinedPlayer$ You.isMonarch | Execute$ TrigCantAttack | TriggerDescription$ At the beginning of combat on each opponent's turn, if you're the monarch, that opponent may pay {X}, where X is the number of cards in their hand. If they don't, they can't attack you this combat.
 SVar:TrigCantAttack:DB$ Effect | Name$ Champions of Minas Tirith's Effect | StaticAbilities$ STCantAttack | UnlessCost$ X | Duration$ UntilEndOfCombat | UnlessPayer$ TriggeredPlayer | UnlessAI$ WillAttack
 SVar:STCantAttack:Mode$ CantAttack | EffectZone$ Command | ValidCard$ Creature | Target$ You | Description$ Creatures can't attack you.
 SVar:X:TriggeredPlayer$CardsInHand
-SVar:Monarch:Count$Monarch.1.0
-Oracle:When Champions of Minas Tirith enters the battlefield, you become the monarch.\nAt the beginning of combat on each opponent's turn, if you're the monarch, that opponent may pay {X}, where X is the number of cards in their hand. If they don't, they can't attack you this combat.
+Oracle:When Champions of Minas Tirith enters the battlefield, you become the monarch.\nAt the beginning of combat on each opponent's turn, if you're the monarch, that opponent may pay {X}, where X is the number of cards in their hand. If they don't, they can't attack you this combat.
\ No newline at end of file