diff --git a/forge-gui/res/cardsfolder/upcoming/fortified_beachhead.txt b/forge-gui/res/cardsfolder/upcoming/fortified_beachhead.txt
index 26a1d8bff58..cb001309aab 100644
--- a/forge-gui/res/cardsfolder/upcoming/fortified_beachhead.txt
+++ b/forge-gui/res/cardsfolder/upcoming/fortified_beachhead.txt
@@ -1,12 +1,8 @@
 Name:Fortified Beachhead
 ManaCost:no cost
 Types:Land
-K:ETBReplacement:Other:DBReveal
-SVar:DBReveal:DB$ Reveal | RevealValid$ Soldier | Optional$ True | RememberRevealed$ True | SubAbility$ DBTap | SpellDescription$ As CARDNAME enters the battlefield, you may reveal a Soldier card from your hand. CARDNAME enters the battlefield tapped unless you revealed a Soldier card this way or you control a Soldier.
-SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | ConditionCheckSVar$ SoldierPresence | ConditionSVarCompare$ EQ0 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:SoldierPresence:Count$RememberedSize/Plus.SoldierControlled
-SVar:SoldierControlled:Count$Valid Soldier.inZoneBattlefield+YouCtrl
+K:ETBReplacement:Other:DBTap
+SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | UnlessCost$ Reveal<1/Soldier> | UnlessPayer$ You | IsPresent$ Soldier.inZoneBattlefield+YouCtrl | PresentCompare$ EQ0 pellDescription$ As CARDNAME enters the battlefield, you may reveal a Soldier card from your hand. CARDNAME enters the battlefield tapped unless you revealed a Soldier card this way or you control a Soldier.
 A:AB$ Mana | Cost$ T | Produced$ Combo W U | SpellDescription$ Add {W} or {U}.
 A:AB$ PumpAll | Cost$ 5 T | ValidCards$ Soldier.YouCtrl | NumAtt$ 1 | NumDef$ 1 | SpellDescription$ Soldiers you control get +1/+1 until end of turn.
 DeckNeeds:Type$Soldier
diff --git a/forge-gui/res/cardsfolder/upcoming/saheeli_filigree_master.txt b/forge-gui/res/cardsfolder/upcoming/saheeli_filigree_master.txt
index 32e06ca9717..85ae112bde8 100644
--- a/forge-gui/res/cardsfolder/upcoming/saheeli_filigree_master.txt
+++ b/forge-gui/res/cardsfolder/upcoming/saheeli_filigree_master.txt
@@ -6,8 +6,8 @@ A:AB$ Scry | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ScryNum$ 1 | Sub
 SVar:DBDraw:DB$ Draw | UnlessCost$ tapXType<1/Artifact> | UnlessPayer$ You | UnlessSwitched$ True
 A:AB$ Token | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | PumpDuration$ EOT | TokenAmount$ 2 | PumpKeywords$ Haste | TokenScript$ c_1_1_a_thopter_flying | TokenOwner$ You | SpellDescription$ Create two 1/1 colorless Thopter artifact creature tokens with flying. They gain haste until end of turn.
 A:AB$ Effect | Cost$ SubCounter<4/LOYALTY> | Name$ Emblem - Saheeli, Filigree Master | StaticAbilities$ EmblemArtifactPump,ReduceCost | Planeswalker$ True | Ultimate$ True | Stackable$ False | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Artifact creatures you control get +1/+1" and "Artifact spells you cast cost 1 less to cast."
-SVar:EmblemArtifactPump:Mode$ Continuous | AddPower$ 1 | AddToughness$ 1 | EffectZone$ Command | Affected$ Artifact.YouCtrl | AffectedZone$ Battlefield | Description$ Artifact creatures you control get +1/+1  
-SVar:ReduceCost:Mode$ ReduceCost | ValidCard$ Artifact | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Artifact spells you cast cost {1} less to cast. | Description$  Artifact spells you cast cost 1 less to cast.
+SVar:EmblemArtifactPump:Mode$ Continuous | AddPower$ 1 | AddToughness$ 1 | EffectZone$ Command | Affected$ Artifact.YouCtrl | AffectedZone$ Battlefield | Description$ Artifact creatures you control get +1/+1.
+SVar:ReduceCost:Mode$ ReduceCost | ValidCard$ Artifact | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Artifact spells you cast cost {1} less to cast. | Description$ Artifact spells you cast cost 1 less to cast.
 DeckHas:Ability$Token
 DeckHints:Type$Artifact
 DeckHas:Ability$Token & Type$Thopter
diff --git a/forge-gui/res/cardsfolder/upcoming/terisian_mindbreaker.txt b/forge-gui/res/cardsfolder/upcoming/terisian_mindbreaker.txt
index 12d94e47c10..e8b27b2c145 100644
--- a/forge-gui/res/cardsfolder/upcoming/terisian_mindbreaker.txt
+++ b/forge-gui/res/cardsfolder/upcoming/terisian_mindbreaker.txt
@@ -7,6 +7,6 @@ SVar:TrigMill:DB$ Mill | NumCards$ X | Defined$ TriggeredDefendingPlayer
 SVar:X:TriggeredDefendingPlayer$CardsInLibrary/HalfUp
 K:Unearth:1 U U U
 DeckHints:Color$Blue
-DeckHas:Ability$Graveyard & Keyword$Mill
+DeckHas:Ability$Graveyard|Mill
 SVar:HasAttackEffect:TRUE
 Oracle:Whenever Terisian Mindbreaker attacks, defending player mills half their library, rounded up.\nUnearth {1}{U}{U}{U} ({1}{U}{U}{U}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/the_stasis_coffin.txt b/forge-gui/res/cardsfolder/upcoming/the_stasis_coffin.txt
index 7d01a851e52..7a9f4141796 100644
--- a/forge-gui/res/cardsfolder/upcoming/the_stasis_coffin.txt
+++ b/forge-gui/res/cardsfolder/upcoming/the_stasis_coffin.txt
@@ -2,5 +2,4 @@ Name:The Stasis Coffin
 ManaCost:3
 Types:Legendary Artifact
 A:AB$ Pump | Cost$ 2 T Exile<1/CARDNAME> | Defined$ You | Duration$ UntilYourNextTurn | KW$ Protection from everything | SpellDescription$ You gain protection from everything until your next turn.
-DeckHas:Ability$Sacrifice
 Oracle:{2},{T}, Exile The Stasis Coffin: You gain protection from everything until your next turn.
\ No newline at end of file