diff --git a/.gitattributes b/.gitattributes
index 81ebfc18333..dd51f71a200 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -534,6 +534,7 @@ res/cardsfolder/a/ashenmoor_liege.txt svneol=native#text/plain
 res/cardsfolder/a/ashes_of_the_fallen.txt svneol=native#text/plain
 res/cardsfolder/a/ashes_to_ashes.txt svneol=native#text/plain
 res/cardsfolder/a/ashling_the_extinguisher.txt -text
+res/cardsfolder/a/ashling_the_extinguisher_avatar.txt -text
 res/cardsfolder/a/ashling_the_pilgrim_avatar.txt -text
 res/cardsfolder/a/ashlings_prerogative.txt -text
 res/cardsfolder/a/ashmouth_hound.txt -text
diff --git a/res/cardsfolder/a/ashling_the_extinguisher_avatar.txt b/res/cardsfolder/a/ashling_the_extinguisher_avatar.txt
new file mode 100644
index 00000000000..1e8ba27982b
--- /dev/null
+++ b/res/cardsfolder/a/ashling_the_extinguisher_avatar.txt
@@ -0,0 +1,10 @@
+Name:Ashling, the Extinguisher Avatar
+ManaCost:no cost
+Types:Vanguard
+Text:no text
+HandLifeModifier:+1/-3
+A:AB$ DestroyAll | ActivationZone$ Command | Cost$ 5 | ValidCards$ Permanent.nonLand | PlayerTurn$ True | SubAbility$ DBRemoveAB | SpellDescription$ Destroy all nonland permanents. Activate this ability only once and only during your turn.
+SVar:DBRemoveAB:DB$ Animate | RemoveAllAbilities$ True | Permanent$ True
+SVar:Picture:http://www.cardforge.org/fpics/vgd-lq/ashling_the_extinguisher_avatar.jpg
+SetInfo:VAN|Special|http://magiccards.info/extras/other/vanguard-mtgo-2/ashling-the-extinguisher.jpg
+End
\ No newline at end of file
diff --git a/res/cardsfolder/c/cursed_rack.txt b/res/cardsfolder/c/cursed_rack.txt
index 226b2aadd0d..4a897fd689b 100644
--- a/res/cardsfolder/c/cursed_rack.txt
+++ b/res/cardsfolder/c/cursed_rack.txt
@@ -3,7 +3,7 @@ ManaCost:4
 Types:Artifact
 Text:no text
 K:ETBReplacement:Other:ChooseP
-SVar:ChooseP:DB$ ChoosePlayer | Defined$ You | Choices$ Opponent | AILogic$ Curse | SpellDescription$ As CARDNAME enters the battlefield, choose an opponent.
+SVar:ChooseP:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | AILogic$ Curse | SpellDescription$ As CARDNAME enters the battlefield, choose an opponent.
 S:Mode$ Continuous | Affected$ Player.Chosen | SetMaxHandSize$ 4 | Description$ The chosen player's maximum hand size is four.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cursed_rack.jpg
diff --git a/res/cardsfolder/g/gateway_shade.txt b/res/cardsfolder/g/gateway_shade.txt
index 04748657004..5125c602779 100644
--- a/res/cardsfolder/g/gateway_shade.txt
+++ b/res/cardsfolder/g/gateway_shade.txt
@@ -5,6 +5,8 @@ Text:no text
 PT:1/1
 A:AB$ Pump | Cost$ B | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ CARDNAME gets +1/+1 until end of turn.
 A:AB$ Pump | Cost$ tapXType<1/Gate> | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ CARDNAME gets +2/+2 until end of turn.
+SVar:RemRandomDeck:True
+DeckNeeds:Type$Gate
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gateway_shade.jpg
 SetInfo:GTC|Uncommon|http://magiccards.info/scans/en/gtc/65.jpg
 Oracle:{B}: Gateway Shade gets +1/+1 until end of turn.\nTap an untapped Gate you control: Gateway Shade gets +2/+2 until end of turn.
diff --git a/res/cardsfolder/m/molten_sentry.txt b/res/cardsfolder/m/molten_sentry.txt
index f99bd44e976..9a3734e78c6 100644
--- a/res/cardsfolder/m/molten_sentry.txt
+++ b/res/cardsfolder/m/molten_sentry.txt
@@ -3,8 +3,8 @@ ManaCost:3 R
 Types:Creature Elemental
 Text:no text
 PT:*/*
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigFlip | Static$ True | TriggerDescription$ As Molten Sentry enters the battlefield, flip a coin. If the coin comes up heads, Molten Sentry enters the battlefield as a 5/2 creature with haste. If it comes up tails, Molten Sentry enters the battlefield as a 2/5 creature with defender.
-SVar:TrigFlip:AB$ FlipACoin | Cost$ 0 | WinSubAbility$ DBAttacker | LoseSubAbility$ DBDefender
+K:ETBReplacement:Other:TrigFlip
+SVar:TrigFlip:DB$ FlipACoin | WinSubAbility$ DBAttacker | LoseSubAbility$ DBDefender | SpellDescription$ As Molten Sentry enters the battlefield, flip a coin. If the coin comes up heads, Molten Sentry enters the battlefield as a 5/2 creature with haste. If it comes up tails, Molten Sentry enters the battlefield as a 2/5 creature with defender.
 SVar:DBAttacker:DB$ Animate | Cost$ 0 | Defined$ Self | Power$ 5 | Toughness$ 2 | Types$ Creature | Keywords$ Haste | Permanent$ True
 SVar:DBDefender:DB$ Animate | Cost$ 0 | Defined$ Self | Power$ 2 | Toughness$ 5 | Types$ Creature | Keywords$ Defender | Permanent$ True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/s/sage_of_fables.txt b/res/cardsfolder/s/sage_of_fables.txt
index 2030bcf0cb0..242d59b7880 100644
--- a/res/cardsfolder/s/sage_of_fables.txt
+++ b/res/cardsfolder/s/sage_of_fables.txt
@@ -3,8 +3,9 @@ ManaCost:2 U
 Types:Creature Merfolk Wizard
 Text:no text
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Wizard+Other+YouCtrl |TriggerZones$ Battlefield | Execute$ TrigPutCounter | Static$ True | TriggerDescription$ Each other Wizard creature you control enters the battlefield with an additional +1/+1 counter on it.
-SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ TriggeredCard | CounterType$ P1P1 | CounterNum$ 1
+R:Event$ Moved | ActiveZones$ Battlefield | Destination$ Battlefield | ValidCard$ Creature.Wizard+Other+YouCtrl | ReplaceWith$ AddExtraCounter | Description$ Each other Wizard creature you control enters the battlefield with an additional +1/+1 counter on it.
+SVar:AddExtraCounter:AB$ PutCounter | Cost$ 0 | Defined$ ReplacedCard | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ MoveToBattlefield
+SVar:MoveToBattlefield:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
 A:AB$ Draw | Cost$ 2 SubCounter<1/P1P1/Creature.YouCtrl/Creature you Control> | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon