diff --git a/forge-gui/res/cardsfolder/upcoming/lord_skitters_butcher.txt b/forge-gui/res/cardsfolder/upcoming/lord_skitters_butcher.txt
index 858eee4040c..faa02cf13cf 100644
--- a/forge-gui/res/cardsfolder/upcoming/lord_skitters_butcher.txt
+++ b/forge-gui/res/cardsfolder/upcoming/lord_skitters_butcher.txt
@@ -3,10 +3,12 @@ ManaCost:2 B
 Types:Creature Rat Peasant
 PT:2/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigCharm | TriggerDescription$ When CARDNAME enters the battlefield, choose one —
-SVar:TrigCharm:DB$ Charm | Choices$ DBToken,DBScry,DBPumpAll
+SVar:TrigCharm:DB$ Charm | Choices$ DBToken,DBSacrifice,DBPumpAll
 SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_1_1_rat_noblock | SpellDescription$ Create a 1/1 black Rat creature token with "This creature can't block."
-SVar:DBScry:AB$ Scry | Cost$ Sac<1/Creature.Other/another creature> | ScryNum$ 2 | SubAbility$ DBDraw | SpellDescription$ You may sacrifice another creature. If you do, scry 2, then draw a card.
-SVar:DBDraw:DB$ Draw
+SVar:DBSacrifice:DB$ Sacrifice | SacValid$ Creature.Other | SacMessage$ another creature | Optional$ True | RememberSacrificed$ True | SubAbility$ DBScry | SpellDescription$ You may sacrifice another creature. If you do, scry 2, then draw a card.
+SVar:DBScry:DB$ Scry | ScryNum$ 2 | SubAbility$ DBDraw | ConditionDefined$ Remembered | ConditionPresent$ Card
+SVar:DBDraw:DB$ Draw | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Menace | SpellDescription$ Creatures you control gain menace until end of turn.
 DeckHas:Ability$Token|Sacrifice
 Oracle:When Lord Skitter's Butcher enters the battlefield, choose one —\n• Create a 1/1 black Rat creature token with "This creature can't block."\n• You may sacrifice another creature. If you do, scry 2, then draw a card.\n• Creatures you control gain menace until end of turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/moment_of_valor.txt b/forge-gui/res/cardsfolder/upcoming/moment_of_valor.txt
index 49b11df3308..736d75f082c 100644
--- a/forge-gui/res/cardsfolder/upcoming/moment_of_valor.txt
+++ b/forge-gui/res/cardsfolder/upcoming/moment_of_valor.txt
@@ -1,7 +1,8 @@
 Name:Moment of Valor
 ManaCost:2 W
-A:SP$ Charm | Choices$ DBIndestructible,DBDestroy | MinCharmNum$ 1 | CharmNum$ 2
-SVar:DBIndestructible:DB$ Untap | ValidTgts$ Creature | SubAbility$ DBPump | SpellDescription$ SpellDescription$ Untap target creature. It gets +1/+0 and gains indestructible until end of turn.
+Types:Instant
+A:SP$ Charm | Choices$ DBIndestructible,DBDestroy
+SVar:DBIndestructible:DB$ Untap | ValidTgts$ Creature | SubAbility$ DBPump | SpellDescription$ Untap target creature. It gets +1/+0 and gains indestructible until end of turn.
 SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ Indestructible
 SVar:DBDestroy:DB$ Destroy | ValidTgts$ Creature.powerGE4 | TgtPrompt$ Select target creature with power 4 or greater | SpellDescription$ Destroy target creature with power 4 or greater.
 Oracle:Choose one —\n• Untap target creature. It gets +1/+0 and gains indestructible until end of turn.\n• Destroy target creature with power 4 or greater.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/mosswood_dreadknight_dread_whispers.txt b/forge-gui/res/cardsfolder/upcoming/mosswood_dreadknight_dread_whispers.txt
index cb26dc9349d..08ea7671ea2 100644
--- a/forge-gui/res/cardsfolder/upcoming/mosswood_dreadknight_dread_whispers.txt
+++ b/forge-gui/res/cardsfolder/upcoming/mosswood_dreadknight_dread_whispers.txt
@@ -4,9 +4,8 @@ Types:Creature Human Knight
 PT:3/2
 K:Trample
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigEffect | TriggerDescription$ When CARDNAME dies, you may cast it from your graveyard as an Adventure until the end of your next turn.
-SVar:DBEffect:DB$ Effect | StaticAbilities$ STPlay | SubAbility$ DBCleanup | ForgetOnMoved$ Exile | Duration$ UntilTheEndOfYourNextTurn
-SVar:STPlay:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.EffectSource+Adventure | AffectedZone$ Exile | Description$ Until the end of your next turn, you may play EFFECTSOURCE as an adventure. 
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:TrigEffect:DB$ Effect | StaticAbilities$ STPlay | ForgetOnMoved$ Exile | Duration$ UntilTheEndOfYourNextTurn
+SVar:STPlay:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.EffectSource+Adventure | AffectedZone$ Graveyard | Description$ Until the end of your next turn, you may play EFFECTSOURCE as an adventure. 
 DeckHas:Ability$Graveyard
 AlternateMode:Adventure
 Oracle:Trample\nWhen Mosswood Dreadknight dies, you may cast it from your graveyard as an Adventure until the end of your next turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/night_of_the_sweets_revenge.txt b/forge-gui/res/cardsfolder/upcoming/night_of_the_sweets_revenge.txt
index ada88ad7067..2ba7eaac616 100644
--- a/forge-gui/res/cardsfolder/upcoming/night_of_the_sweets_revenge.txt
+++ b/forge-gui/res/cardsfolder/upcoming/night_of_the_sweets_revenge.txt
@@ -3,7 +3,7 @@ ManaCost:3 G
 Types:Enchantment
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigFood | TriggerDescription$ When CARDNAME enters the battlefield, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
 SVar:TrigFood:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You
-S:Mode$ Continuous | Affected$ Artifact.YouCtrl | AddAbility$ AnyMana | Description$ Foods you control have "{T}: Add {G}."
+S:Mode$ Continuous | Affected$ Food.YouCtrl | AddAbility$ AnyMana | Description$ Foods you control have "{T}: Add {G}."
 SVar:AnyMana:AB$ Mana | Cost$ T | Produced$ G | Amount$ 1 | SpellDescription$ Add {G}.
 A:AB$ PumpAll | Cost$ 5 G G Sac<1/CARDNAME> | ValidCards$ Creature.YouCtrl | NumAtt$ +X | NumDef$ +X | SorcerySpeed$ True | SpellDescription$ Creatures you control get +X/+X until end of turn, where X is the number of Foods you control. Activate only as a sorcery.
 SVar:X:Count$Valid Food.YouCtrl
diff --git a/forge-gui/res/cardsfolder/upcoming/ogre_chitterlord.txt b/forge-gui/res/cardsfolder/upcoming/ogre_chitterlord.txt
index 09118474c14..2b71622751e 100644
--- a/forge-gui/res/cardsfolder/upcoming/ogre_chitterlord.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ogre_chitterlord.txt
@@ -5,7 +5,7 @@ PT:6/5
 K:Menace
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, create two 1/1 black Rat creature tokens with "This creature can't block." Then if you control five or more Rats, each Rat you control gets +2/+0 until end of turn.
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, create two 1/1 black Rat creature tokens with "This creature can't block." Then if you control five or more Rats, each Rat you control gets +2/+0 until end of turn.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_1_1_rat_noblock | SubAbility$ DBPumpAll
+SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ b_1_1_rat_noblock | SubAbility$ DBPumpAll
 SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Rat.YouCtrl | NumAtt$ 2 | ConditionPresent$ Rat.YouCtrl | ConditionCompare$ GE5
 SVar:HasAttackEffect:TRUE
 DeckHas:Ability$Token & Type$Rat