diff --git a/forge-gui/res/cardsfolder/d/dungeon_master.txt b/forge-gui/res/cardsfolder/d/dungeon_master.txt
index af30cd16013..1510b67fa0c 100644
--- a/forge-gui/res/cardsfolder/d/dungeon_master.txt
+++ b/forge-gui/res/cardsfolder/d/dungeon_master.txt
@@ -5,7 +5,7 @@ Loyalty:1
 K:ETBReplacement:Other:RollLoyal
 SVar:RollLoyal:DB$ RollDice | Sides$ 4 | ResultSVar$ Result | SubAbility$ DBLoyalty | SpellDescription$ Add 1d4 loyalty counters to CARDNAME
 SVar:DBLoyalty:DB$ PutCounter | Defined$ Self | CounterType$ LOYALTY | CounterNum$ Result | ETB$ True
-A:AB$ Token | Cost$ AddCounter<1/LOYALTY> | ValidTgts$ Opponent | TokenOwner$ Targeted | TokenScript$ b_1_1_skeleton_opp_life | Planeswalker$ True | SpellDescription$ Target opponent creates a 1/1 black Skeleton creature token with "When this creature dies, each opponent gains 2 life.""
+A:AB$ Token | Cost$ AddCounter<1/LOYALTY> | ValidTgts$ Opponent | TokenOwner$ Targeted | TokenScript$ b_1_1_skeleton_opp_life | Planeswalker$ True | SpellDescription$ Target opponent creates a 1/1 black Skeleton creature token with "When this creature dies, each opponent gains 2 life."
 A:AB$ RollDice | Cost$ AddCounter<1/LOYALTY> | Sides$ 20 | On1$ DBSkipTurn | ResultSVar$ Result | Planeswalker$ True | SubAbility$ DBDraw | SpellDescription$ Roll a d20. If you roll a 1, skip your next turn. If you roll a 12 or higher, draw a card.
 SVar:DBSkipTurn:DB$ SkipTurn | Defined$ You | NumTurns$ 1
 SVar:DBDraw:DB$ Draw | ConditionCheckSVar$ Result | ConditionSVarCompare$ GE12
@@ -13,5 +13,6 @@ A:AB$ Token | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True
 SVar:DBCleric:DB$ Token | TokenScript$ w_1_1_cleric_lifelink | SubAbility$ DBRogue
 SVar:DBRogue:DB$ Token | TokenScript$ b_2_2_rogue_hexproof | SubAbility$ DBWizard
 SVar:DBWizard:DB$ Token | TokenScript$ u_1_1_wizard_flying
-DeckHas:Ability$Token
-Oracle:[+1]: Target opponent creates a 1/1 black Skeleton creature token with “When this creature dies, each opponent gains 2 life.”\n[+1]: Roll a d20. If you roll a 1, skip your next turn. If you roll a 12 or higher, draw a card.\n[−6]: You get an adventuring party. (Your party is a 3/3 red Fighter with first strike, a 1/1 white Cleric with lifelink, a 2/2 black Rogue with hexproof, and a 1/1 blue Wizard with flying.)
+DeckHas:Ability$Token & Ability$LifeGain
+DeckHints:Ability$Party
+Oracle:[+1]: Target opponent creates a 1/1 black Skeleton creature token with "When this creature dies, each opponent gains 2 life."\n[+1]: Roll a d20. If you roll a 1, skip your next turn. If you roll a 12 or higher, draw a card.\n[−6]: You get an adventuring party. (Your party is a 3/3 red Fighter with first strike, a 1/1 white Cleric with lifelink, a 2/2 black Rogue with hexproof, and a 1/1 blue Wizard with flying.)
diff --git a/forge-gui/res/cardsfolder/k/king_narfis_betrayal.txt b/forge-gui/res/cardsfolder/k/king_narfis_betrayal.txt
index 41fee8e29f7..13f34ea2e29 100644
--- a/forge-gui/res/cardsfolder/k/king_narfis_betrayal.txt
+++ b/forge-gui/res/cardsfolder/k/king_narfis_betrayal.txt
@@ -5,7 +5,7 @@ K:Saga:3:DBMill,DBEffect,DBEffect
 SVar:DBMill:DB$ Mill | NumCards$ 4 | Defined$ Player | SubAbility$ DBRepeatEach | SpellDescription$ Each player mills four cards. Then you may exile a creature or planeswalker card from each graveyard.
 SVar:DBRepeatEach:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBExile
 SVar:DBExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | ChangeType$ Creature.RememberedPlayerCtrl,Planeswalker.RememberedPlayerCtrl | ChangeNum$ 1 | Chooser$ You | Optional$ True | Hidden$ True
-SVar:DBEffect:DB$ Effect | StaticAbilities$ PlayExile | SpellDescription$ Until end of turn, you may cast spells from among cards exiled with CARDNAME’s Betrayal, and you may spend mana as though it were mana of any color to cast those spells.
+SVar:DBEffect:DB$ Effect | StaticAbilities$ PlayExile | SpellDescription$ Until end of turn, you may cast spells from among cards exiled with CARDNAME, and you may spend mana as though it were mana of any color to cast those spells.
 SVar:PlayExile:Mode$ Continuous | MayPlayIgnoreType$ True | MayPlayIgnoreColor$ True | MayPlay$ True | Affected$ Card.ExiledWithEffectSource | AffectedZone$ Exile | Description$ You may play cards exiled with EFFECTSOURCE, and you may spend mana as though it were mana of any color to cast those spells.
 DeckHas:Ability$Mill
 Oracle:(As this Saga enters and after your draw step, add a lore counter. Sacrifice after III.)\nI — Each player mills four cards. Then you may exile a creature or planeswalker card from each graveyard.\nII, III — Until end of turn, you may cast spells from among cards exiled with King Narfi's Betrayal, and you may spend mana as though it were mana of any color to cast those spells.
diff --git a/forge-gui/res/cardsfolder/r/ruthless_winnower.txt b/forge-gui/res/cardsfolder/r/ruthless_winnower.txt
index 93cd40365eb..3eb80474d47 100644
--- a/forge-gui/res/cardsfolder/r/ruthless_winnower.txt
+++ b/forge-gui/res/cardsfolder/r/ruthless_winnower.txt
@@ -2,8 +2,9 @@ Name:Ruthless Winnower
 ManaCost:3 B B
 Types:Creature Elf Rogue
 PT:4/4
-T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ At the beginning of each player's upkeep, that player sacrifices a non-Elf creature.
-SVar:TrigSac:DB$Sacrifice | SacValid$ Creature.nonElf | Defined$ TriggeredPlayer
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ At the beginning of each player's upkeep, that player sacrifices a non-Elf creature.
+SVar:TrigSac:DB$ Sacrifice | SacValid$ Creature.nonElf | Defined$ TriggeredPlayer
 AI:RemoveDeck:Random
 DeckHints:Type$Elf
-Oracle:At the beginning of each player's upkeep, that player sacrifices a non-Elf creature.
\ No newline at end of file
+DeckHas:Ability$Sacrifice
+Oracle:At the beginning of each player's upkeep, that player sacrifices a non-Elf creature.
diff --git a/forge-gui/res/cardsfolder/s/sky_swallower.txt b/forge-gui/res/cardsfolder/s/sky_swallower.txt
index 8839c148a28..498f83fea72 100644
--- a/forge-gui/res/cardsfolder/s/sky_swallower.txt
+++ b/forge-gui/res/cardsfolder/s/sky_swallower.txt
@@ -4,7 +4,6 @@ Types:Creature Leviathan
 PT:8/8
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainControl | TriggerDescription$ When CARDNAME enters the battlefield, target opponent gains control of all other permanents you control.
-SVar:TrigGainControl:DB$ GainControl | ValidTgts$ Opponent | AllValid$ Permanent.Other+YouCtrl | NewController$ Opponent
+SVar:TrigGainControl:DB$ GainControl | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | AllValid$ Permanent.Other+YouCtrl | NewController$ TargetedPlayer
 AI:RemoveDeck:Random
-SVar:Picture:http://resources.wizards.com/magic/cards/gpt/en-us/card96835.jpg
 Oracle:Flying\nWhen Sky Swallower enters the battlefield, target opponent gains control of all other permanents you control.
diff --git a/forge-gui/res/cardsfolder/upcoming/bold_plagiarist.txt b/forge-gui/res/cardsfolder/upcoming/bold_plagiarist.txt
index 0755c4d0f41..210cc127e1f 100644
--- a/forge-gui/res/cardsfolder/upcoming/bold_plagiarist.txt
+++ b/forge-gui/res/cardsfolder/upcoming/bold_plagiarist.txt
@@ -3,6 +3,7 @@ ManaCost:3 B
 Types:Creature Vampire Rogue
 PT:2/2
 K:Flash
-T:Mode$ CounterPlayerAddedAll | ValidSource$ Opponent | ValidObjectToSource$ Creature.YouCtrl | Execute$ TrigCounter | TriggerDescription$ Whenever an opponent puts one or more counters on a creature they control, they put the same number and kind of counters on CARDNAME.
+T:Mode$ CounterPlayerAddedAll | ValidSource$ Opponent | ValidObjectToSource$ Creature.YouCtrl | Execute$ TrigCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever an opponent puts one or more counters on a creature they control, they put the same number and kind of counters on CARDNAME.
 SVar:TrigCounter:DB$ PutCounter | Defined$ Self | Placer$ TriggeredSource | TriggeredCounterMap$ True
+DeckHas:Ability$Counters
 Oracle:Flash\nWhenever an opponent puts one or more counters on a creature they control, they put the same number and kind of counters on Bold Plagiarist.
diff --git a/forge-gui/res/cardsfolder/upcoming/mage_duel.txt b/forge-gui/res/cardsfolder/upcoming/mage_duel.txt
index f8ae5190764..b368b7c77f8 100644
--- a/forge-gui/res/cardsfolder/upcoming/mage_duel.txt
+++ b/forge-gui/res/cardsfolder/upcoming/mage_duel.txt
@@ -1,7 +1,7 @@
 Name:Mage Duel
 ManaCost:2 G
 Types:Sorcery
-A:SP$ Pump | Cost$ G | ValidTgts$ Creature.YouCtrl | AILogic$ Fight | TgtPrompt$ Select target creature you control | SubAbility$ DBFight | NumAtt$ +1 | NumDef$ +2 | SpellDescription$ Target creature you control gets +1/+2 until end of turn. It fights target creature you don't control.
+A:SP$ Pump | ValidTgts$ Creature.YouCtrl | AILogic$ Fight | TgtPrompt$ Select target creature you control | SubAbility$ DBFight | NumAtt$ +1 | NumDef$ +2 | SpellDescription$ Target creature you control gets +1/+2 until end of turn. It fights target creature you don't control.
 SVar:DBFight:DB$ Fight | Defined$ ParentTarget | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control
 S:Mode$ ReduceCost | ValidCard$ Card.Self | EffectZone$ All | Type$ Spell | Amount$ 2 | CheckSVar$ X | SVarCompare$ GE1 | Description$ CARDNAME costs {2} less to cast if you've cast an instant or sorcery spell this turn.
 SVar:X:Count$ThisTurnCast_Instant.YouCtrl,Sorcery.YouCtrl
diff --git a/forge-gui/res/cardsfolder/upcoming/mentors_guidance.txt b/forge-gui/res/cardsfolder/upcoming/mentors_guidance.txt
index 4e8f9288078..e377c29f8ca 100644
--- a/forge-gui/res/cardsfolder/upcoming/mentors_guidance.txt
+++ b/forge-gui/res/cardsfolder/upcoming/mentors_guidance.txt
@@ -3,7 +3,7 @@ ManaCost:2 U
 Types:Sorcery
 T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ TrigCopy | TriggerDescription$ When you cast this spell, copy it if you control a planeswalker, Cleric, Druid, Shaman, Warlock, or Wizard.
 SVar:TrigCopy:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | ConditionPresent$ Planeswalker.YouCtrl,Cleric.YouCtrl,Druid.YouCtrl,Shaman.YouCtrl,Warlock.YouCtrl,Wizard.YouCtrl | ConditionCompare$ GE1
-A:SP$ Scry | Cost$ U | ScryNum$ 1 | SubAbility$ DBDraw | SpellDescription$ Scry 1,
-SVar:DBDraw:DB$Draw | Defined$ You | NumCards$ 1 | SpellDescription$ then draw a card.
+A:SP$ Scry | ScryNum$ 1 | SubAbility$ DBDraw | SpellDescription$ Scry 1,
+SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SpellDescription$ then draw a card.
 DeckHints:Type$Planeswalker|Cleric|Druid|Shaman|Warlock|Wizard
 Oracle:When you cast this spell, copy it if you control a planeswalker, Cleric, Druid, Shaman, Warlock, or Wizard.\nScry 1, then draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/wandering_archaic_explore_the_vastlands.txt b/forge-gui/res/cardsfolder/upcoming/wandering_archaic_explore_the_vastlands.txt
index e36b7a8a669..f7c9eee1246 100644
--- a/forge-gui/res/cardsfolder/upcoming/wandering_archaic_explore_the_vastlands.txt
+++ b/forge-gui/res/cardsfolder/upcoming/wandering_archaic_explore_the_vastlands.txt
@@ -3,7 +3,7 @@ ManaCost:5
 Types:Creature Avatar
 PT:4/4
 T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigCopySpell | TriggerDescription$ Whenever an opponent casts an instant or sorcery spell, they may pay {2}. If they don't, you may copy that spell. You may choose new targets for the copy.
-SVar:TrigCopySpell:DB$ CopySpellAbility | UnlessCost$ 2 | UnlessPayer$ TriggeredActivator | Defined$ TriggeredSpellAbility | AILogic$ Always | Optional$ True | MayChooseTarget$ True
+SVar:TrigCopySpell:DB$ CopySpellAbility | UnlessCost$ 2 | UnlessPayer$ TriggeredActivator | Controller$ You | Defined$ TriggeredSpellAbility | AILogic$ Always | Optional$ True | MayChooseTarget$ True
 AlternateMode:Modal
 Oracle:Whenever an opponent casts an instant or sorcery spell, they may pay {2}. If they don't, you may copy that spell. You may choose new targets for the copy.
 
diff --git a/forge-gui/res/editions/Mystery Booster.txt b/forge-gui/res/editions/Mystery Booster.txt
index 9076618b666..e06952dc39a 100644
--- a/forge-gui/res/editions/Mystery Booster.txt	
+++ b/forge-gui/res/editions/Mystery Booster.txt	
@@ -1748,7 +1748,7 @@ Champion of Arashin
 Charge
 Cliffside Lookout
 Cloudshift
-#Coalition Honor Guard
+Coalition Honor Guard
 Collar the Culprit
 Congregate
 Conviction