diff --git a/forge-gui/res/cardsfolder/upcoming/scout_the_wilderness.txt b/forge-gui/res/cardsfolder/upcoming/scout_the_wilderness.txt
index 8b32b026ab8..9ea2db9089c 100644
--- a/forge-gui/res/cardsfolder/upcoming/scout_the_wilderness.txt
+++ b/forge-gui/res/cardsfolder/upcoming/scout_the_wilderness.txt
@@ -1,9 +1,9 @@
 Name:Scout the Wilderness
 ManaCost:2 G
 Types:Sorcery
-K:Kicker:2 W
-A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | Mandatory$ True | SubAbility$ DBToken | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle. If this spell was kicked, create two 1/1 white Soldier creature tokens.
+K:Kicker:1 W
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | SubAbility$ DBToken | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle. If this spell was kicked, create two 1/1 white Soldier creature tokens.
 SVar:DBToken:DB$ Token | TokenAmount$ 2 | TokenScript$ w_1_1_soldier | Condition$ Kicked
-DeckHints:Color|White
-DeckHas:Ability|Token
+DeckHints:Color$White
+DeckHas:Ability$Token
 Oracle:Kicker {1}{W} (You may pay an additional {1}{W} as you cast this spell.)\nSearch your library for a basic land card, put it onto the battlefield tapped, then shuffle. If this spell was kicked, create two 1/1 white Soldier creature tokens.
diff --git a/forge-gui/res/cardsfolder/upcoming/serra_paragon.txt b/forge-gui/res/cardsfolder/upcoming/serra_paragon.txt
index 695f98b85b0..2c2810364ba 100644
--- a/forge-gui/res/cardsfolder/upcoming/serra_paragon.txt
+++ b/forge-gui/res/cardsfolder/upcoming/serra_paragon.txt
@@ -3,10 +3,11 @@ ManaCost:2 W W
 Types:Creature Angel
 PT:3/4
 K:Flying
-T:Mode$ Continuous | Affected$ Permanent.YouOwn+cmcLE3,Land.YouOwn| Condition$ PlayerTurn | MayPlay$ True | Execute$ DBAnimate | MayPlayLimit$ 1 | EffectZone$ Battlefield | AffectedZone$ Graveyard | Description$ Once during each of your turns, you may play a land from your graveyard or cast a permanent spell with mana value 3 or less from your graveyard. If you do, it gains “When this permanent is put into a graveyard from the battlefield, exile it and you gain 2 life.”
+S:Mode$ Continuous | Affected$ Permanent.YouOwn+cmcLE3,Land.YouOwn| Condition$ PlayerTurn | MayPlay$ True | MayPlayLimit$ 1 | EffectZone$ Battlefield | AffectedZone$ Graveyard | Description$ Once during each of your turns, you may play a land from your graveyard or cast a permanent spell with mana value 3 or less from your graveyard. If you do, it gains “When this permanent is put into a graveyard from the battlefield, exile it and you gain 2 life.”
+T:Mode$ SpellCast | ValidCard$ Dragon.wasCastFromYourGraveyard | ValidActivatingPlayer$ You | Execute$ DBAnimate | TriggerZones$ Battlefield | TriggerDescription$ 
 SVar:DBAnimate:DB$ Animate | Defined$ TriggeredCard | Duration$ Permanent | Triggers$ TrigDieExile
-SVar:TrigDieExile:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When this creature dies, exile it.
+SVar:TrigDieExile:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When this permanent is put into a graveyard from the battlefield, exile it and you gain 2 life
 SVar:TrigExile:DB$ ChangeZone | Defined$ TriggeredNewCardLKICopy | Origin$ Graveyard | Destination$ Exile | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ 2
-DeckHas:Ability$Graveyard
+DeckHas:Ability$Graveyard|Lifegain
 Oracle:Flying\nOnce during each of your turns, you may play a land from your graveyard or cast a permanent spell with mana value 3 or less from your graveyard. If you do, it gains “When this permanent is put into a graveyard from the battlefield, exile it and you gain 2 life.”
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/shanna_purifying_blade.txt b/forge-gui/res/cardsfolder/upcoming/shanna_purifying_blade.txt
index c0ecf955bca..fdf1c57f8a8 100644
--- a/forge-gui/res/cardsfolder/upcoming/shanna_purifying_blade.txt
+++ b/forge-gui/res/cardsfolder/upcoming/shanna_purifying_blade.txt
@@ -1,10 +1,11 @@
 Name:Shanna, Purifying Blade
 ManaCost:1 G W U
 Types:Legendary Creature Human Warrior
+PT:3/3
 K:Lifelink
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ At the beginning of your end step, you may pay {X}. If you do, draw X cards. X can't be greater than the amount of life you gained this turn.
 SVar:TrigDraw:AB$ Draw | Cost$ X | XMaxLimit$ LifeGained | NumCards$ X
 SVar:X:Count$xPaid
 SVar:LifeGained:Count$LifeYouGainedThisTurn
-DeckNeeds:Ability$LifeGain
-Oracle:Flash\nWhen Prayer of Binding enters the battlefield, exile up to one target nonland permanent an opponent controls until Prayer of Binding leaves the battlefield. You gain 2 life.
+DeckHas:Ability$LifeGain
+Oracle:Lifelink\nAt the beginning of your end step, you may pay {X}. If you do, draw X cards. X can't be greater than the amount of life you gained this turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/sheoldreds_restoration.txt b/forge-gui/res/cardsfolder/upcoming/sheoldreds_restoration.txt
index 9ff8a3642a5..84df4c1b7d1 100644
--- a/forge-gui/res/cardsfolder/upcoming/sheoldreds_restoration.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sheoldreds_restoration.txt
@@ -2,7 +2,7 @@ Name:Sheoldred's Restoration
 ManaCost:3 B
 Types:Sorcery
 K:Kicker:2 W
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigReturn | TriggerDescription$ Return target creature card from your graveyard to the battlefield. If this spell was kicked, you gain life equal to that card's mana value. Otherwise, you lose that much life.
+A:SP$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigReturn | TriggerDescription$ Return target creature card from your graveyard to the battlefield. If this spell was kicked, you gain life equal to that card's mana value. Otherwise, you lose that much life.
 SVar:TrigReturn:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouOwn | SubAbility$ DBGainLife | TgtPrompt$ Select target creature to return from your graveyard
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ X | SubAbility$ DBLoseLife | Condition$ Kicked
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ X | ConditionCheckSVar$ Y | ConditionSVarCompare$ EQ0 | SubAbility$ DBChange
@@ -10,5 +10,4 @@ SVar:DBChange:DB$ ChangeZone | Origin$ Stack | Destination$ Exile | StackDescrip
 SVar:X:Targeted$CardManaCost
 SVar:Y:Count$TimesKicked
 DeckHas:Ability$Graveyard|Lifegain
-DeckHints:Ability$Discard
 Oracle:Return target creature card from your graveyard to the battlefield. If this spell was kicked, you gain life equal to that card’s mana value. Otherwise, you lose that much life.Exile Sheoldred’s Restoration.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/shield_wall_sentinel.txt b/forge-gui/res/cardsfolder/upcoming/shield_wall_sentinel.txt
index f12f4614b1f..fc4ea0702b7 100644
--- a/forge-gui/res/cardsfolder/upcoming/shield_wall_sentinel.txt
+++ b/forge-gui/res/cardsfolder/upcoming/shield_wall_sentinel.txt
@@ -4,7 +4,7 @@ Types:Artifact Creature Golem
 PT:1/3
 K:Defender
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBSearch | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a creature card with defender, reveal it, put it into your hand, then shuffle.
-SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature.withDefender | ChangeNum$ 1
+SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Creature.withDefender | ChangeNum$ 1
 DeckNeeds:Type|Defender
 DeckHints:Type|Defender
 Oracle:DefenderWhen Shield-Wall Sentinel enters the battlefield, you may search your library for a creature card with defender, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/splatter_goblin.txt b/forge-gui/res/cardsfolder/upcoming/splatter_goblin.txt
index cb4131166a0..65b18194ffa 100644
--- a/forge-gui/res/cardsfolder/upcoming/splatter_goblin.txt
+++ b/forge-gui/res/cardsfolder/upcoming/splatter_goblin.txt
@@ -4,4 +4,5 @@ Types:Creature Phyrexian Goblin
 PT:2/1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME dies, target creature an opponent controls gets -1/-1 until end of turn.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True
+SVar:SacMe:1
 Oracle:When Splatter Goblin dies, target creature an opponent controls gets -1/-1 until end of turn.