diff --git a/forge-gui/res/cardsfolder/h/howl_of_the_horde.txt b/forge-gui/res/cardsfolder/h/howl_of_the_horde.txt
index 3e5470b7009..8efb9d2eed5 100644
--- a/forge-gui/res/cardsfolder/h/howl_of_the_horde.txt
+++ b/forge-gui/res/cardsfolder/h/howl_of_the_horde.txt
@@ -1,9 +1,10 @@
 Name:Howl of the Horde
 ManaCost:2 R
 Types:Sorcery
-A:SP$ DelayedTrigger | Cost$ 2 R | AILogic$ SpellCopy | Execute$ EffTrigCopy | ThisTurn$ True | Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You |  | SubAbility$ DBEffect | SpellDescription$ When you cast your next instant or sorcery spell this turn, copy that spell.
+A:SP$ DelayedTrigger | Cost$ 2 R | AILogic$ SpellCopy | Execute$ EffTrigCopy | ThisTurn$ True | Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | SubAbility$ DBEffect | SpellDescription$ When you cast your next instant or sorcery spell this turn, copy that spell.
 SVar:DBEffect:DB$ DelayedTrigger | AILogic$ SpellCopy | Execute$ EffTrigCopy | ThisTurn$ True | Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | ConditionCheckSVar$ RaidTest | ConditionSVarCompare$ GE1 | References$ RaidTest | SpellDescription$ Raid — If you attacked this turn, when you cast your next instant or sorcery spell this turn, copy that spell an additional time. You may choose new targets for the copy.
 SVar:RaidTest:Count$AttackersDeclared
 SVar:EffTrigCopy:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | MayChooseTarget$ True
 SVar:AIPriorityModifier:9
+DeckNeeds:Type$Instant|Sorcery
 Oracle:When you cast your next instant or sorcery spell this turn, copy that spell. You may choose new targets for the copy.\nRaid — If you attacked this turn, when you cast your next instant or sorcery spell this turn, copy that spell an additional time. You may choose new targets for the copy.
diff --git a/forge-gui/res/cardsfolder/k/kytheon_hero_of_akros.txt b/forge-gui/res/cardsfolder/k/kytheon_hero_of_akros.txt
index c231d378422..31cbbf90c9c 100644
--- a/forge-gui/res/cardsfolder/k/kytheon_hero_of_akros.txt
+++ b/forge-gui/res/cardsfolder/k/kytheon_hero_of_akros.txt
@@ -20,7 +20,7 @@ ManaCost:no cost
 Colors:white
 Types:Legendary Planeswalker Gideon
 Loyalty:3
-A:AB$ MustAttack | Cost$ AddCounter<2/LOYALTY> | Planeswalker$ True | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature.OppCtrl | Defender$ Self | TgtPrompt$ Select target creature an opponent control | SpellDescription$ Up to one target creature an opponent controls attacks CARDNAME during its controller's next turn if able.
+A:AB$ MustAttack | Cost$ AddCounter<2/LOYALTY> | Planeswalker$ True | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature.OppCtrl | Defender$ Self | TgtPrompt$ Select target creature an opponent controls | SpellDescription$ Up to one target creature an opponent controls attacks CARDNAME during its controller's next turn if able.
 A:AB$ Pump | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Indestructible | UntilYourNextTurn$ True | SubAbility$ DBUntap | SpellDescription$ Until your next turn, target creature gains indestructible. Untap that creature.
 SVar:DBUntap:DB$ Untap | Defined$ Targeted
 A:AB$ Animate | Cost$ AddCounter<0/LOYALTY> | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Creature,Human,Soldier | Keywords$ Indestructible | SubAbility$ DBPrevent | Planeswalker$ True | Ultimate$ True | SpellDescription$ Until end of turn, CARDNAME becomes a 4/4 Human Soldier creature with indestructible that's still a planeswalker. Prevent all damage that would be dealt to him this turn.
diff --git a/forge-gui/res/cardsfolder/l/legion_warboss.txt b/forge-gui/res/cardsfolder/l/legion_warboss.txt
index 41676dc7b51..2e01c3305ab 100644
--- a/forge-gui/res/cardsfolder/l/legion_warboss.txt
+++ b/forge-gui/res/cardsfolder/l/legion_warboss.txt
@@ -4,9 +4,9 @@ Types:Creature Goblin Soldier
 PT:2/2
 K:Mentor
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of combat on your turn, create a 1/1 red Goblin creature token. That token gains haste until end of turn and attacks this combat if able.
-SVar:TrigToken:DB$ Token | TokenOwner$ You | TokenAmount$ 1 | TokenScript$ r_1_1_goblin | LegacyImage$ r 1 1 goblin grn | RememberTokens$ True | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ Haste & HIDDEN CARDNAME attacks each combat if able. | SubAbility$ DBCleanup
+SVar:TrigToken:DB$ Token | TokenOwner$ You | TokenAmount$ 1 | TokenScript$ r_1_1_goblin | LegacyImage$ r 1 1 goblin grn | RememberTokens$ True | SubAbility$ DBPumpTurn
+SVar:DBPumpTurn:DB$ Pump | Defined$ Remembered | KW$ Haste | SubAbility$ DBPumpCombat
+SVar:DBPumpCombat:DB$ Pump | Defined$ Remembered | KW$ HIDDEN CARDNAME attacks each combat if able. | UntilEndOfCombat$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHas:Ability$Counters & Ability$Token
-SVar:Picture:http://www.wizards.com/global/images/magic/general/legion_warboss.jpg
 Oracle:Mentor (Whenever this creature attacks, put a +1/+1 counter on target attacking creature with lesser power.)\nAt the beginning of combat on your turn, create a 1/1 red Goblin creature token. That token gains haste until end of turn and attacks this combat if able.
diff --git a/forge-gui/res/cardsfolder/upcoming/hamza_guardian_of_arashin.txt b/forge-gui/res/cardsfolder/upcoming/hamza_guardian_of_arashin.txt
index 59c584643e2..461bc3defc8 100644
--- a/forge-gui/res/cardsfolder/upcoming/hamza_guardian_of_arashin.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hamza_guardian_of_arashin.txt
@@ -3,7 +3,7 @@ ManaCost:4 G W
 Types:Legendary Creature Elephant Warrior
 PT:5/5
 S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | References$ X | EffectZone$ All | Description$ This spell costs {1} less to cast for each creature you control with a +1/+1 counter on it.
-S:Mode$ ReduceCost | ValidCard$ Creature | Type$ Spell | Activator$ You | Amount$ X | References$ X | EffectZone$ All | Description$ Creature spells you cast cost {1} less to cast for each creature you control with a +1/+1 counter on it.
+S:Mode$ ReduceCost | ValidCard$ Creature | Type$ Spell | Activator$ You | Amount$ X | References$ X | EffectZone$ Battlefield | Description$ Creature spells you cast cost {1} less to cast for each creature you control with a +1/+1 counter on it.
 SVar:X:Count$Valid Creature.YouCtrl+counters_GE1_P1P1
 DeckHints:Ability$Counters & Type$Creature
 Oracle:This spell costs {1} less to cast for each creature you control with a +1/+1 counter on it.\nCreature spells you cast cost {1} less to cast for each creature you control with a +1/+1 counter on it.