diff --git a/res/cardsfolder/adun_oakenshield.txt b/res/cardsfolder/adun_oakenshield.txt
index 6d37dfe32f3..f6a8f44b4fd 100644
--- a/res/cardsfolder/adun_oakenshield.txt
+++ b/res/cardsfolder/adun_oakenshield.txt
@@ -3,7 +3,7 @@ ManaCost:G R B
 Types:Legendary Creature Human Knight
 Text:no text
 PT:1/2
-A:AB$ChangeZone | Cost$ B R G T | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Select target creature card in your graveyard | ValidTgts$ Creature.YouCtrl  | SpellDescription$ Return target creature card from your graveyard to your hand.
+A:AB$ ChangeZone | Cost$ B R G T | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Select target creature card in your graveyard | ValidTgts$ Creature.YouCtrl  | SpellDescription$ Return target creature card from your graveyard to your hand.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adun_oakenshield.jpg
 SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/256.jpg
diff --git a/res/cardsfolder/aether_vial.txt b/res/cardsfolder/aether_vial.txt
index 4dfdb870300..71599cc3a46 100644
--- a/res/cardsfolder/aether_vial.txt
+++ b/res/cardsfolder/aether_vial.txt
@@ -2,7 +2,7 @@ Name:AEther Vial
 ManaCost:1
 Types:Artifact
 Text:no text
-A:AB$ChangeZone | Cost$ T | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature.cmcEQX | ChangeNum$ 1 | SpellDescription$ You may put a creature card with converted mana cost equal to the number of charge counters on AEther Vial from your hand onto the battlefield.
+A:AB$ ChangeZone | Cost$ T | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature.cmcEQX | ChangeNum$ 1 | SpellDescription$ You may put a creature card with converted mana cost equal to the number of charge counters on CARDNAME from your hand onto the battlefield.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your upkeep, you may put a charge counter on CARDNAME.
 SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ CHARGE | CounterNum$ 1 
 SVar:X:Count$CardCounters.CHARGE
diff --git a/res/cardsfolder/alexi_zephyr_mage.txt b/res/cardsfolder/alexi_zephyr_mage.txt
index 84454e74de0..66109e6744d 100644
--- a/res/cardsfolder/alexi_zephyr_mage.txt
+++ b/res/cardsfolder/alexi_zephyr_mage.txt
@@ -3,7 +3,7 @@ ManaCost:3 U U
 Types:Legendary Creature Human Spellshaper
 Text:no text
 PT:3/3
-A:AB$ChangeZone | Cost$ X U T Discard<2/Card> | Origin$ Battlefield | Destination$ Hand | TargetMin$ 0 | TargetMax$ MaxTgts | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Return X target creatures to their owners' hands.
+A:AB$ ChangeZone | Cost$ X U T Discard<2/Card> | Origin$ Battlefield | Destination$ Hand | TargetMin$ 0 | TargetMax$ MaxTgts | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Return X target creatures to their owners' hands.
 # It may seem wrong to not use X in the target, but since the Targets are what defines X, it's redundant (and not supported by the code)
 SVar:X:Targeted$Amount
 SVar:MaxTgts:Count$Valid Creature
diff --git a/res/cardsfolder/amugaba.txt b/res/cardsfolder/amugaba.txt
index 79ae9c68ddd..0e3df25f2ad 100644
--- a/res/cardsfolder/amugaba.txt
+++ b/res/cardsfolder/amugaba.txt
@@ -4,7 +4,7 @@ Types:Creature Illusion
 Text:no text
 PT:6/6
 K:Flying
-A:AB$ChangeZone | Cost$ 2 U Discard<1/Card> | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
+A:AB$ ChangeZone | Cost$ 2 U Discard<1/Card> | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/amugaba.jpg
 SetInfo:ODY|Rare|http://magiccards.info/scans/en/od/61.jpg
diff --git a/res/cardsfolder/amulet_of_unmaking.txt b/res/cardsfolder/amulet_of_unmaking.txt
index 5ad63aaf44e..9f01f72bf68 100644
--- a/res/cardsfolder/amulet_of_unmaking.txt
+++ b/res/cardsfolder/amulet_of_unmaking.txt
@@ -2,7 +2,7 @@ Name:Amulet of Unmaking
 ManaCost:5
 Types:Artifact
 Text:no text
-A:AB$ChangeZone | Cost$ 5 T Exile<1/CARDNAME> | ValidTgts$ Artifact,Creature,Land | SorcerySpeed$ True | TgtPrompt$ Select target artifact, creature, or land | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target artifact, creature, or land. Activate this ability only any time you could cast a sorcery.
+A:AB$ ChangeZone | Cost$ 5 T Exile<1/CARDNAME> | ValidTgts$ Artifact,Creature,Land | SorcerySpeed$ True | TgtPrompt$ Select target artifact, creature, or land | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target artifact, creature, or land. Activate this ability only any time you could cast a sorcery.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/amulet_of_unmaking.jpg
 SetInfo:MIR|Rare|http://magiccards.info/scans/en/mr/258.jpg
diff --git a/res/cardsfolder/apprentice_necromancer.txt b/res/cardsfolder/apprentice_necromancer.txt
index dfaf92b7f92..2292775aabf 100644
--- a/res/cardsfolder/apprentice_necromancer.txt
+++ b/res/cardsfolder/apprentice_necromancer.txt
@@ -3,7 +3,7 @@ ManaCost:1 B
 Types:Creature Zombie Wizard
 Text:no text
 PT:1/1
-A:AB$ChangeZone | Cost$ B T Sac<1/CARDNAME>  | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature in your graveyard | GainControl$ True | SubAbility$ SVar=DBPump | SpellDescription$ Return target creature card from your graveyard to the battlefield. That creature gains haste. At the beginning of the next end step, sacrifice it.
+A:AB$ ChangeZone | Cost$ B T Sac<1/CARDNAME>  | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature in your graveyard | GainControl$ True | SubAbility$ SVar=DBPump | SpellDescription$ Return target creature card from your graveyard to the battlefield. That creature gains haste. At the beginning of the next end step, sacrifice it.
 SVar:DBPump:DB$Pump | KW$ Haste & HIDDEN At the beginning of the end step, sacrifice CARDNAME. | Defined$ Targeted
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/arcanis_the_omnipotent.txt b/res/cardsfolder/arcanis_the_omnipotent.txt
index cd4567aac50..9b2ee492334 100644
--- a/res/cardsfolder/arcanis_the_omnipotent.txt
+++ b/res/cardsfolder/arcanis_the_omnipotent.txt
@@ -3,8 +3,8 @@ ManaCost:3 U U U
 Types:Legendary Creature Wizard
 Text:no text
 PT:3/4
-A:AB$Draw | Cost$ T | NumCards$ 3 | SpellDescription$ Draw three cards.
-A:AB$ChangeZone | Cost$ 2 U U | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
+A:AB$ Draw | Cost$ T | NumCards$ 3 | SpellDescription$ Draw three cards.
+A:AB$ ChangeZone | Cost$ 2 U U | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/arcanis_the_omnipotent.jpg
 SetInfo:ONS|Rare|http://magiccards.info/scans/en/on/66.jpg
diff --git a/res/cardsfolder/arcbound_reclaimer.txt b/res/cardsfolder/arcbound_reclaimer.txt
index e15f09cbac2..2dee46dd009 100644
--- a/res/cardsfolder/arcbound_reclaimer.txt
+++ b/res/cardsfolder/arcbound_reclaimer.txt
@@ -3,7 +3,7 @@ ManaCost:4
 Types:Artifact Creature Golem
 Text:no text
 PT:0/0
-A:AB$ChangeZone | Cost$ SubCounter<1/P1P1> | TgtPrompt$ Choose target artifact card in your graveyard | ValidTgts$ Artifact.YouCtrl | Origin$ Graveyard | Destination$ Library | SpellDescription$ Put target artifact card from your graveyard on top of your library.
+A:AB$ ChangeZone | Cost$ SubCounter<1/P1P1> | TgtPrompt$ Choose target artifact card in your graveyard | ValidTgts$ Artifact.YouCtrl | Origin$ Graveyard | Destination$ Library | SpellDescription$ Put target artifact card from your graveyard on top of your library.
 K:Modular 2
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/archon_of_justice.txt b/res/cardsfolder/archon_of_justice.txt
index db397259c61..f1d29b28b3e 100644
--- a/res/cardsfolder/archon_of_justice.txt
+++ b/res/cardsfolder/archon_of_justice.txt
@@ -2,7 +2,7 @@ Name:Archon of Justice
 ManaCost:3 W W
 Types:Creature Archon
 Text:no text
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When Archon of Justice is put into a graveyard from the battlefield, exile target permanent.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, exile target permanent.
 SVar:TrigChange:AB$ChangeZone | Cost$ 0 | ValidTgts$ Permanent | Origin$ Battlefield | Destination$ Exile
 PT:4/4
 K:Flying
diff --git a/res/cardsfolder/argivian_archaeologist.txt b/res/cardsfolder/argivian_archaeologist.txt
index 3db5c32dd0f..2a39175c872 100644
--- a/res/cardsfolder/argivian_archaeologist.txt
+++ b/res/cardsfolder/argivian_archaeologist.txt
@@ -3,7 +3,7 @@ ManaCost:1 W W
 Types:Creature Human Artificer
 Text:no text
 PT:1/1
-A:AB$ChangeZone | Cost$ W W T | TgtPrompt$ Choose target artifact card in your graveyard | ValidTgts$ Artifact.YouCtrl | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return target artifact card from your graveyard to your hand.
+A:AB$ ChangeZone | Cost$ W W T | TgtPrompt$ Choose target artifact card in your graveyard | ValidTgts$ Artifact.YouCtrl | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return target artifact card from your graveyard to your hand.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/argivian_archaeologist.jpg
 SetInfo:ATQ|Rare|http://magiccards.info/scans/en/aq/94.jpg
diff --git a/res/cardsfolder/armillary_sphere.txt b/res/cardsfolder/armillary_sphere.txt
index 25f0d6dfe21..0dfa0746066 100644
--- a/res/cardsfolder/armillary_sphere.txt
+++ b/res/cardsfolder/armillary_sphere.txt
@@ -2,7 +2,7 @@ Name:Armillary Sphere
 ManaCost:2
 Types:Artifact
 Text:no text
-A:AB$ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 2 | SpellDescription$ Search your library for up to two basic land cards, reveal them, and put them into your hand. Then shuffle your library.
+A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 2 | SpellDescription$ Search your library for up to two basic land cards, reveal them, and put them into your hand. Then shuffle your library.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/armillary_sphere.jpg
 SetInfo:CFX|Common|http://magiccards.info/scans/en/cfx/134.jpg
diff --git a/res/cardsfolder/auramancer.txt b/res/cardsfolder/auramancer.txt
index 26561f9b77e..9ec27932a62 100644
--- a/res/cardsfolder/auramancer.txt
+++ b/res/cardsfolder/auramancer.txt
@@ -3,7 +3,7 @@ ManaCost:2 W
 Types:Creature Human Wizard
 Text:no text
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ When Auramancer enters the battlefield, you may return target enchantment card from your graveyard to your hand.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may return target enchantment card from your graveyard to your hand.
 SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Enchantment.YouCtrl
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/auramancer.jpg
diff --git a/res/cardsfolder/auriok_salvagers.txt b/res/cardsfolder/auriok_salvagers.txt
index 0e8070f1903..fa0514e9e89 100644
--- a/res/cardsfolder/auriok_salvagers.txt
+++ b/res/cardsfolder/auriok_salvagers.txt
@@ -3,7 +3,7 @@ ManaCost:3 W
 Types:Creature Human Soldier
 Text:no text
 PT:2/4
-A:AB$ChangeZone | Cost$ 1 W | TgtPrompt$ Choose target artifact card with converted mana cost 1 or less in your graveyard | ValidTgts$ Artifact.cmcLE1+YouCtrl | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return target artifact card with converted mana cost 1 or less from your graveyard to your hand.
+A:AB$ ChangeZone | Cost$ 1 W | TgtPrompt$ Choose target artifact card with converted mana cost 1 or less in your graveyard | ValidTgts$ Artifact.cmcLE1+YouCtrl | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return target artifact card with converted mana cost 1 or less from your graveyard to your hand.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/auriok_salvagers.jpg
 SetInfo:5DN|Uncommon|http://magiccards.info/scans/en/5dn/4.jpg
diff --git a/res/cardsfolder/avarax.txt b/res/cardsfolder/avarax.txt
index 37e6dac470c..adaa0635dad 100644
--- a/res/cardsfolder/avarax.txt
+++ b/res/cardsfolder/avarax.txt
@@ -4,7 +4,7 @@ Types:Creature Beast
 Text:no text
 PT:3/3
 K:Haste
-A:AB$Pump | Cost$ 1 R | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
+A:AB$ Pump | Cost$ 1 R | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a card named Avarax, reveal it, and put it into your hand. If you do, shuffle your library.
 SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Hand | ChangeType$ Card.namedAvarax | ChangeNum$ 1
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/aven_augur.txt b/res/cardsfolder/aven_augur.txt
index 55bc6c8ea0c..844e283d54d 100644
--- a/res/cardsfolder/aven_augur.txt
+++ b/res/cardsfolder/aven_augur.txt
@@ -4,7 +4,7 @@ Types:Creature Bird Wizard
 Text:no text
 PT:2/2
 K:Flying
-A:AB$ChangeZone | Cost$ Sac<1/CARDNAME> | TargetMin$ 0 | TargetMax$ 2 | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand | PlayerTurn$ True | ActivatingPhases$ Upkeep | SpellDescription$ Return up to two target creatures to their owners' hands. Activate this ability only during your upkeep.
+A:AB$ ChangeZone | Cost$ Sac<1/CARDNAME> | TargetMin$ 0 | TargetMax$ 2 | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand | PlayerTurn$ True | ActivatingPhases$ Upkeep | SpellDescription$ Return up to two target creatures to their owners' hands. Activate this ability only during your upkeep.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aven_augur.jpg
 SetInfo:FUT|Common|http://magiccards.info/scans/en/fut/32.jpg
diff --git a/res/cardsfolder/avenger_en_dal.txt b/res/cardsfolder/avenger_en_dal.txt
index 0b4e9e65855..da099deb04b 100644
--- a/res/cardsfolder/avenger_en_dal.txt
+++ b/res/cardsfolder/avenger_en_dal.txt
@@ -3,7 +3,7 @@ ManaCost:1 W
 Types:Creature Human Spellshaper
 Text:no text
 PT:1/1
-A:AB$ChangeZone | Cost$ 2 W T Discard<1/Card> | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target attacking creature. Its controller gains life equal to its toughness. | SubAbility$ SVar=DBGainLife
+A:AB$ ChangeZone | Cost$ 2 W T Discard<1/Card> | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target attacking creature. Its controller gains life equal to its toughness. | SubAbility$ SVar=DBGainLife
 SVar:DBGainLife:DB$GainLife | Defined$ TargetedController | LifeAmount$ X
 SVar:X:Targeted$CardToughness
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/azorius_chancery.txt b/res/cardsfolder/azorius_chancery.txt
index 27d7fdfb2f9..da141659c72 100644
--- a/res/cardsfolder/azorius_chancery.txt
+++ b/res/cardsfolder/azorius_chancery.txt
@@ -2,7 +2,7 @@ Name:Azorius Chancery
 ManaCost:no cost
 Types:Land
 Text:no text
-K:Azorius Chancery enters the battlefield tapped.
+K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ W U | SpellDescription$ Add W U to your mana pool.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
 SVar:TrigReturn:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl
diff --git a/res/cardsfolder/barrin_master_wizard.txt b/res/cardsfolder/barrin_master_wizard.txt
index 2960a2b434b..83e7af0b421 100644
--- a/res/cardsfolder/barrin_master_wizard.txt
+++ b/res/cardsfolder/barrin_master_wizard.txt
@@ -3,7 +3,7 @@ ManaCost:1 U U
 Types:Legendary Creature Human Wizard
 Text:no text
 PT:1/1
-A:AB$ChangeZone | Cost$ 2 Sac<1/Permanent> | ValidTgts$ Creature | TgtPrompt$ Select target Creature | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand.
+A:AB$ ChangeZone | Cost$ 2 Sac<1/Permanent> | ValidTgts$ Creature | TgtPrompt$ Select target Creature | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/barrin_master_wizard.jpg
diff --git a/res/cardsfolder/belbes_portal.txt b/res/cardsfolder/belbes_portal.txt
index acbc669409a..247ff6263d1 100644
--- a/res/cardsfolder/belbes_portal.txt
+++ b/res/cardsfolder/belbes_portal.txt
@@ -2,7 +2,7 @@ Name:Belbe's Portal
 ManaCost:5
 Types:Artifact
 Text:As CARDNAME enters the battlefield, choose a creature type.
-A:AB$ChangeZone | Cost$ 3 T | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature.ChosenType | ChangeNum$ 1 | SpellDescription$ You may put a creature card from your hand onto the battlefield.
+A:AB$ ChangeZone | Cost$ 3 T | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature.ChosenType | ChangeNum$ 1 | SpellDescription$ You may put a creature card from your hand onto the battlefield.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/belbes_portal.jpg
 SetInfo:NMS|Rare|http://magiccards.info/scans/en/ne/127.jpg
diff --git a/res/cardsfolder/bladewing_the_risen.txt b/res/cardsfolder/bladewing_the_risen.txt
index be015243b9c..6f7b380956e 100644
--- a/res/cardsfolder/bladewing_the_risen.txt
+++ b/res/cardsfolder/bladewing_the_risen.txt
@@ -4,8 +4,8 @@ Types:Legendary Creature Zombie Dragon
 Text:no text
 PT:4/4
 K:Flying
-A:AB$PumpAll | Cost$ B R | ValidCards$ Creature.Dragon | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Dragon creatures get +1/+1 until end of turn.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | OptionalDecider$ You | TriggerDescription$ When Bladewing the Risen enters the battlefield, you may return target Dragon permanent card from your graveyard to the battlefield.
+A:AB$ PumpAll | Cost$ B R | ValidCards$ Creature.Dragon | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Dragon creatures get +1/+1 until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may return target Dragon permanent card from your graveyard to the battlefield.
 SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Permanent.Dragon+YouOwn | TgtPrompt$ Choose target Dragon permanent in your graveyard.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bladewing_the_risen.jpg
diff --git a/res/cardsfolder/bladewings_thrall.txt b/res/cardsfolder/bladewings_thrall.txt
index fb2d7f82e77..2c6cb6e0112 100644
--- a/res/cardsfolder/bladewings_thrall.txt
+++ b/res/cardsfolder/bladewings_thrall.txt
@@ -3,7 +3,7 @@ ManaCost:2 B B
 Types:Creature Zombie
 Text:no text
 PT:3/3
-K:stPumpSelf:Creature:0/0/Flying:isPresent Dragon.YouCtrl:Bladewing's Thrall has flying as long as you control a Dragon.
+K:stPumpSelf:Creature:0/0/Flying:isPresent Dragon.YouCtrl:CARDNAME has flying as long as you control a Dragon.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Dragon | TriggerZones$ Graveyard | OptionalDecider$ You | Execute$ TrigReturn | TriggerDescription$ When a Dragon enters the battlefield, you may return CARDNAME from your graveyard to the battlefield.
 SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield
 SVar:BuffedBy:Dragon
diff --git a/res/cardsfolder/blinking_spirit.txt b/res/cardsfolder/blinking_spirit.txt
index 10a68294bd9..48dc6bcfaaf 100644
--- a/res/cardsfolder/blinking_spirit.txt
+++ b/res/cardsfolder/blinking_spirit.txt
@@ -3,7 +3,7 @@ ManaCost:3 W
 Types:Creature Spirit
 Text:no text
 PT:2/2
-A:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
+A:AB$ ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blinking_spirit.jpg
diff --git a/res/cardsfolder/boros_garrison.txt b/res/cardsfolder/boros_garrison.txt
index 1246797bfa2..349138d9eee 100644
--- a/res/cardsfolder/boros_garrison.txt
+++ b/res/cardsfolder/boros_garrison.txt
@@ -2,7 +2,7 @@ Name:Boros Garrison
 ManaCost:no cost
 Types:Land
 Text:no text
-K:Boros Garrison enters the battlefield tapped.
+K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ R W | SpellDescription$ Add R W to your mana pool.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
 SVar:TrigReturn:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl
diff --git a/res/cardsfolder/brittle_effigy.txt b/res/cardsfolder/brittle_effigy.txt
index e45be926317..b6f2fafabc4 100644
--- a/res/cardsfolder/brittle_effigy.txt
+++ b/res/cardsfolder/brittle_effigy.txt
@@ -2,7 +2,7 @@ Name:Brittle Effigy
 ManaCost:1
 Types:Artifact
 Text:no text
-A:AB$ChangeZone | Cost$ 4 T Exile<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target creature.
+A:AB$ ChangeZone | Cost$ 4 T Exile<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target creature.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/brittle_effigy.jpg
 SetInfo:M11|Rare|http://magiccards.info/scans/en/m11/202.jpg
diff --git a/res/cardsfolder/cage_of_hands.txt b/res/cardsfolder/cage_of_hands.txt
index 3aa49695d95..401bb1e321a 100644
--- a/res/cardsfolder/cage_of_hands.txt
+++ b/res/cardsfolder/cage_of_hands.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 K:enPumpCurse:HIDDEN CARDNAME can't attack or block.:Enchanted creature can't attack or block.
-A:AB$ChangeZone | Cost$ 1 W | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
+A:AB$ ChangeZone | Cost$ 1 W | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cage_of_hands.jpg
 SetInfo:CHK|Common|http://magiccards.info/scans/en/chk/3.jpg
diff --git a/res/cardsfolder/catapult_master.txt b/res/cardsfolder/catapult_master.txt
index 2f576baf697..2f596bf2bb3 100644
--- a/res/cardsfolder/catapult_master.txt
+++ b/res/cardsfolder/catapult_master.txt
@@ -3,7 +3,7 @@ ManaCost:3 W W
 Types:Creature Human Soldier
 Text:no text
 PT:3/3
-A:AB$ChangeZone | Cost$ tapXType<5/Soldier> | ValidTgts$ Creature | TgtPrompt$ Select target Creature | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target creature.
+A:AB$ ChangeZone | Cost$ tapXType<5/Soldier> | ValidTgts$ Creature | TgtPrompt$ Select target Creature | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target creature.
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/catapult_master.jpg
diff --git a/res/cardsfolder/cavern_harpy.txt b/res/cardsfolder/cavern_harpy.txt
index 370e4f1610b..6f588de5240 100644
--- a/res/cardsfolder/cavern_harpy.txt
+++ b/res/cardsfolder/cavern_harpy.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:2/1
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | TriggerZones$ Battlefield | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, return a blue or black creature you control to its owner's hand.
-A:AB$ChangeZone | Cost$ PayLife<1> | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.  
+A:AB$ ChangeZone | Cost$ PayLife<1> | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.  
 SVar:TrigChange:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Creature.Black+YouCtrl,Creature.Blue+YouCtrl
 SVar:RemAIDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/cemetery_reaper.txt b/res/cardsfolder/cemetery_reaper.txt
index 755400304ae..c8984e1eaf5 100644
--- a/res/cardsfolder/cemetery_reaper.txt
+++ b/res/cardsfolder/cemetery_reaper.txt
@@ -4,7 +4,7 @@ Types:Creature Zombie
 Text:no text
 PT:2/2
 K:stPumpAll:Creature.Zombie+Other+YouCtrl:1/1:No Condition:Other Zombie creatures you control get +1/+1.
-A:AB$ChangeZone | Cost$ 2 B T | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Creature | SubAbility$ SVar=DBToken | SpellDescription$ Exile target creature card from a graveyard.  Put a 2/2 black Zombie creature token onto the battlefield.
+A:AB$ ChangeZone | Cost$ 2 B T | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Creature | SubAbility$ SVar=DBToken | SpellDescription$ Exile target creature card from a graveyard.  Put a 2/2 black Zombie creature token onto the battlefield.
 SVar:DBToken:DB$Token | TokenAmount$ 1 | TokenName$ Zombie | TokenTypes$ Creature,Zombie | TokenOwner$ You | TokenColors$ Black | TokenPower$ 2 | TokenToughness$ 2
 SVar:PlayMain1:TRUE
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/cephalid_sage.txt b/res/cardsfolder/cephalid_sage.txt
index e79e90be67a..ecd26de4af4 100644
--- a/res/cardsfolder/cephalid_sage.txt
+++ b/res/cardsfolder/cephalid_sage.txt
@@ -3,7 +3,7 @@ ManaCost:3 U
 Types:Creature Cephalid
 Text:no text
 PT:2/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | Threshold$ True | TriggerDescription$ Threshold - As long as seven or more cards are in your graveyard, Cephalid Sage has "When Cephalid Sage enters the battlefield, draw three cards, then discard two cards."
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | Threshold$ True | TriggerDescription$ Threshold - As long as seven or more cards are in your graveyard, CARDNAME has "When CARDNAME enters the battlefield, draw three cards, then discard two cards."
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 3 | SubAbility$ SVar=DBDiscard
 SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Enchantment.YouCtrl
 SVar:DBDiscard:DB$Discard | NumCards$ 2 | Mode$ TgtChoose | Defined$ You
diff --git a/res/cardsfolder/cerulean_sphinx.txt b/res/cardsfolder/cerulean_sphinx.txt
index 49796692f32..675df17d1ff 100644
--- a/res/cardsfolder/cerulean_sphinx.txt
+++ b/res/cardsfolder/cerulean_sphinx.txt
@@ -4,7 +4,7 @@ Types:Creature Sphinx
 Text:no text
 PT:5/5
 K:Flying
-A:AB$ChangeZone | Cost$ U | Origin$ Battlefield | Destination$ Library | Shuffle$ True | SpellDescription$ CARDNAME's owner shuffles it into his or her library.
+A:AB$ ChangeZone | Cost$ U | Origin$ Battlefield | Destination$ Library | Shuffle$ True | SpellDescription$ CARDNAME's owner shuffles it into his or her library.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cerulean_sphinx.jpg
 SetInfo:RAV|Rare|http://magiccards.info/scans/en/rav/39.jpg
diff --git a/res/cardsfolder/coastal_drake.txt b/res/cardsfolder/coastal_drake.txt
index 3dcb890d7df..29ea1a777c6 100644
--- a/res/cardsfolder/coastal_drake.txt
+++ b/res/cardsfolder/coastal_drake.txt
@@ -4,7 +4,7 @@ Types:Creature Drake
 Text:no text
 PT:2/1
 K:Flying
-A:AB$ChangeZone | Cost$ 1 U T | ValidTgts$ Kavu | TgtPrompt$ Select target Kavu | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target Kavu to its owner's hand.
+A:AB$ ChangeZone | Cost$ 1 U T | ValidTgts$ Kavu | TgtPrompt$ Select target Kavu | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target Kavu to its owner's hand.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/coastal_drake.jpg
 SetInfo:APC|Common|http://magiccards.info/scans/en/ap/22.jpg
diff --git a/res/cardsfolder/coffin_puppets.txt b/res/cardsfolder/coffin_puppets.txt
index f0471d5cbf1..19beffdce89 100644
--- a/res/cardsfolder/coffin_puppets.txt
+++ b/res/cardsfolder/coffin_puppets.txt
@@ -3,7 +3,7 @@ ManaCost:3 B B
 Types:Creature Zombie
 Text:no text
 PT:3/3
-A:AB$ChangeZone | Cost$ Sac<2/Land> | Origin$ Graveyard | Destination$ Battlefield | ActivatingZone$ Graveyard | PlayerTurn$ True | ActivatingPhases$ Upkeep | IsPresent$ Swamp.YouCtrl | SpellDescription$ Return Coffin Puppets from your graveyard to the battlefield. Activate this ability only during your upkeep and only if you control a Swamp.
+A:AB$ ChangeZone | Cost$ Sac<2/Land> | Origin$ Graveyard | Destination$ Battlefield | ActivatingZone$ Graveyard | PlayerTurn$ True | ActivatingPhases$ Upkeep | IsPresent$ Swamp.YouCtrl | SpellDescription$ Return CARDNAME from your graveyard to the battlefield. Activate this ability only during your upkeep and only if you control a Swamp.
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/coffin_puppets.jpg
diff --git a/res/cardsfolder/conviction.txt b/res/cardsfolder/conviction.txt
index 47e9ad26507..7e5cf39dc50 100644
--- a/res/cardsfolder/conviction.txt
+++ b/res/cardsfolder/conviction.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 K:enPump:+1/+3
-A:AB$ChangeZone | Cost$ W | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
+A:AB$ ChangeZone | Cost$ W | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/conviction.jpg
 SetInfo:STH|Common|http://magiccards.info/scans/en/sh/105.jpg
diff --git a/res/cardsfolder/copper_gnomes.txt b/res/cardsfolder/copper_gnomes.txt
index dfc21680117..a14d93aa3a1 100644
--- a/res/cardsfolder/copper_gnomes.txt
+++ b/res/cardsfolder/copper_gnomes.txt
@@ -3,7 +3,7 @@ ManaCost:2
 Types:Artifact Creature Gnome
 Text:no text
 PT:1/1
-A:AB$ChangeZone | Cost$ 4 Sac<1/CARDNAME> | Origin$ Hand | Destination$ Battlefield | ChangeType$ Artifact | ChangeNum$ 1 | OptionalDecider$ You | SpellDescription$ You may put an artifact card from your hand onto the battlefield.
+A:AB$ ChangeZone | Cost$ 4 Sac<1/CARDNAME> | Origin$ Hand | Destination$ Battlefield | ChangeType$ Artifact | ChangeNum$ 1 | OptionalDecider$ You | SpellDescription$ You may put an artifact card from your hand onto the battlefield.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/copper_gnomes.jpg
 SetInfo:USG|Rare|http://magiccards.info/scans/en/us/291.jpg
diff --git a/res/cardsfolder/cromat.txt b/res/cardsfolder/cromat.txt
index cf570b9063f..d780e1f36b9 100644
--- a/res/cardsfolder/cromat.txt
+++ b/res/cardsfolder/cromat.txt
@@ -3,10 +3,10 @@ ManaCost:W U B R G
 Types:Legendary Creature Illusion
 Text:no text
 PT:5/5
-A:AB$Pump | Cost$ U R | KW$ Flying | SpellDescription$ CARDNAME gains flying until end of turn.
-A:AB$Regenerate | Cost$ B G | SpellDescription$ Regenerate CARDNAME.
-A:AB$Pump | Cost$ R W | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ CARDNAME gets +1/+1 until end of turn.
-A:AB$ChangeZone | Cost$ G U | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | SpellDescription$ Put CARDNAME on top of its owner's library.
+A:AB$ Pump | Cost$ U R | KW$ Flying | SpellDescription$ CARDNAME gains flying until end of turn.
+A:AB$ Regenerate | Cost$ B G | SpellDescription$ Regenerate CARDNAME.
+A:AB$ Pump | Cost$ R W | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ CARDNAME gets +1/+1 until end of turn.
+A:AB$ ChangeZone | Cost$ G U | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | SpellDescription$ Put CARDNAME on top of its owner's library.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cromat.jpg
 SetInfo:APC|Rare|http://magiccards.info/scans/en/ap/94.jpg
diff --git a/res/cardsfolder/crovax_ascendant_hero.txt b/res/cardsfolder/crovax_ascendant_hero.txt
index ecb35f5ebd0..d5147cb6f9a 100644
--- a/res/cardsfolder/crovax_ascendant_hero.txt
+++ b/res/cardsfolder/crovax_ascendant_hero.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:4/4
 K:stPumpAll:Creature.White+Other:1/1:No Condition:Other white creatures get +1/+1.
 K:stPumpAll:Creature.nonWhite:-1/-1:No Condition:Nonwhite creatures get -1/-1.
-A:AB$ChangeZone | Cost$ PayLife<2> | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
+A:AB$ ChangeZone | Cost$ PayLife<2> | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
 SVar:PlayMain1:TRUE
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crovax_ascendant_hero.jpg
diff --git a/res/cardsfolder/crown_of_flames.txt b/res/cardsfolder/crown_of_flames.txt
index 17aa0a41a4a..74e8358e4e9 100644
--- a/res/cardsfolder/crown_of_flames.txt
+++ b/res/cardsfolder/crown_of_flames.txt
@@ -4,8 +4,8 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 K:enPump:+0/+0
-A:AB$Pump | Cost$ R | Defined$ Enchanted | NumAtt$ +1 | SpellDescription$ Enchanted creature gets +1/+0 until end of turn.
-A:AB$ChangeZone | Cost$ R | Origin$ Battlefield | Destination$ Hand | Defined$ Self | SpellDescription$ Return CARDNAME to its owner's hand.
+A:AB$ Pump | Cost$ R | Defined$ Enchanted | NumAtt$ +1 | SpellDescription$ Enchanted creature gets +1/+0 until end of turn.
+A:AB$ ChangeZone | Cost$ R | Origin$ Battlefield | Destination$ Hand | Defined$ Self | SpellDescription$ Return CARDNAME to its owner's hand.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crown_of_flames.jpg
 SetInfo:TMP|Common|http://magiccards.info/scans/en/tp/169.jpg
diff --git a/res/cardsfolder/crypt_creeper.txt b/res/cardsfolder/crypt_creeper.txt
index c876f8cd06f..6671baf15c9 100644
--- a/res/cardsfolder/crypt_creeper.txt
+++ b/res/cardsfolder/crypt_creeper.txt
@@ -3,7 +3,7 @@ ManaCost:1 B
 Types:Creature Zombie
 Text:no text
 PT:2/1
-A:AB$ChangeZone | Cost$ Sac<1/CARDNAME> | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile target card from a graveyard.
+A:AB$ ChangeZone | Cost$ Sac<1/CARDNAME> | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile target card from a graveyard.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crypt_creeper.jpg
diff --git a/res/cardsfolder/crystal_chimes.txt b/res/cardsfolder/crystal_chimes.txt
index 5e07df8a98d..8d8d4898f5a 100644
--- a/res/cardsfolder/crystal_chimes.txt
+++ b/res/cardsfolder/crystal_chimes.txt
@@ -2,7 +2,7 @@ Name:Crystal Chimes
 ManaCost:3
 Types:Artifact
 Text:no text
-A:AB$ChangeZoneAll | Cost$ 3 T Sac<1/CARDNAME> | ChangeType$ Enchantment.YouOwn | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return all enchantment cards from your graveyard to your hand.
+A:AB$ ChangeZoneAll | Cost$ 3 T Sac<1/CARDNAME> | ChangeType$ Enchantment.YouOwn | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return all enchantment cards from your graveyard to your hand.
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crystal_chimes.jpg
diff --git a/res/cardsfolder/crystal_seer.txt b/res/cardsfolder/crystal_seer.txt
index 8594d44e2c7..7b209634b33 100644
--- a/res/cardsfolder/crystal_seer.txt
+++ b/res/cardsfolder/crystal_seer.txt
@@ -3,7 +3,7 @@ ManaCost:4 U
 Types:Creature Vedalken Wizard
 Text:no text
 PT:2/2
-A:AB$ChangeZone | Cost$ 4 U | Origin$ Battlefield | Destination$ Hand | Defined$ Self | SpellDescription$ Return CARDNAME to it's owner's hand.
+A:AB$ ChangeZone | Cost$ 4 U | Origin$ Battlefield | Destination$ Hand | Defined$ Self | SpellDescription$ Return CARDNAME to it's owner's hand.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigRearrange | TriggerDescription$ When CARDNAME enters the battlefield, look at the top four cards of your library, then put them back in any order.
 SVar:TrigRearrange:AB$RearrangeTopOfLibrary | Cost$ 0 | Defined$ You | NumCards$ 4
 Svar:RemAIDeck:True
diff --git a/res/cardsfolder/darting_merfolk.txt b/res/cardsfolder/darting_merfolk.txt
index 755ca2cf0e7..35324ea227c 100644
--- a/res/cardsfolder/darting_merfolk.txt
+++ b/res/cardsfolder/darting_merfolk.txt
@@ -3,7 +3,7 @@ ManaCost:1 U
 Types:Creature Merfolk
 Text:no text
 PT:1/1
-A:AB$ChangeZone | Cost$ U | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
+A:AB$ ChangeZone | Cost$ U | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/darting_merfolk.jpg
 SetInfo:MMQ|Common|http://magiccards.info/scans/en/mm/72.jpg
diff --git a/res/cardsfolder/daru_cavalier.txt b/res/cardsfolder/daru_cavalier.txt
index 69d19866004..d3a9530583e 100644
--- a/res/cardsfolder/daru_cavalier.txt
+++ b/res/cardsfolder/daru_cavalier.txt
@@ -4,7 +4,7 @@ Types:Creature Human Soldier
 Text:no text
 PT:2/2
 K:First Strike
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a card named Daru Cavalier, reveal it, and put it into your hand. If you do, shuffle your library.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a card named CARDNAME, reveal it, and put it into your hand. If you do, shuffle your library.
 SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Hand | ChangeType$ Card.namedDaru Cavalier | ChangeNum$ 1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/daru_cavalier.jpg
diff --git a/res/cardsfolder/didgeridoo.txt b/res/cardsfolder/didgeridoo.txt
index 7969fd1bcf3..f0f191f9c49 100644
--- a/res/cardsfolder/didgeridoo.txt
+++ b/res/cardsfolder/didgeridoo.txt
@@ -2,7 +2,7 @@ Name:Didgeridoo
 ManaCost:1
 Types:Artifact
 Text:no text
-A:AB$ChangeZone | Cost$ 3 | Origin$ Hand | Destination$ Battlefield | ChangeType$ Permanent.Minotaur | ChangeNum$ 1 | SpellDescription$ You may put a Minotaur permanent card from your hand onto the battlefield.
+A:AB$ ChangeZone | Cost$ 3 | Origin$ Hand | Destination$ Battlefield | ChangeType$ Permanent.Minotaur | ChangeNum$ 1 | SpellDescription$ You may put a Minotaur permanent card from your hand onto the battlefield.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/didgeridoo.jpg
 SetInfo:HML|Rare|http://magiccards.info/scans/en/hl/130.jpg
diff --git a/res/cardsfolder/dimir_aqueduct.txt b/res/cardsfolder/dimir_aqueduct.txt
index 28b27c04725..5601fdb603a 100644
--- a/res/cardsfolder/dimir_aqueduct.txt
+++ b/res/cardsfolder/dimir_aqueduct.txt
@@ -2,7 +2,7 @@ Name:Dimir Aqueduct
 ManaCost:no cost
 Types:Land
 Text:no text
-K:Dimir Aqueduct enters the battlefield tapped.
+K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ U B | SpellDescription$ Add U B to your mana pool.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
 SVar:TrigReturn:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl
diff --git a/res/cardsfolder/dispersing_orb.txt b/res/cardsfolder/dispersing_orb.txt
index e6c59878bc2..98ce36d71a7 100644
--- a/res/cardsfolder/dispersing_orb.txt
+++ b/res/cardsfolder/dispersing_orb.txt
@@ -2,7 +2,7 @@ Name:Dispersing Orb
 ManaCost:3 U U
 Types:Enchantment
 Text:no text
-A:AB$ChangeZone | Cost$ 3 U Sac<1/Permanent> | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target permanent to its owner's hand.
+A:AB$ ChangeZone | Cost$ 3 U Sac<1/Permanent> | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target permanent to its owner's hand.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dispersing_orb.jpg
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/doomed_necromancer.txt b/res/cardsfolder/doomed_necromancer.txt
index 8acdcba507a..04211bbab0e 100644
--- a/res/cardsfolder/doomed_necromancer.txt
+++ b/res/cardsfolder/doomed_necromancer.txt
@@ -3,7 +3,7 @@ ManaCost:2 B
 Types:Creature Human Cleric Mercenary
 Text:no text
 PT:2/2
-A:AB$ChangeZone | Cost$ B T Sac<1/CARDNAME> | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | SpellDescription$ Return target creature card from your graveyard to the battlefield.
+A:AB$ ChangeZone | Cost$ B T Sac<1/CARDNAME> | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | SpellDescription$ Return target creature card from your graveyard to the battlefield.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/doomed_necromancer.jpg
 SetInfo:ONS|Rare|http://magiccards.info/scans/en/on/140.jpg
diff --git a/res/cardsfolder/dowsing_shaman.txt b/res/cardsfolder/dowsing_shaman.txt
index ef29c998b66..f8844a2168a 100644
--- a/res/cardsfolder/dowsing_shaman.txt
+++ b/res/cardsfolder/dowsing_shaman.txt
@@ -3,7 +3,7 @@ ManaCost:4 G
 Types:Creature Centaur Shaman
 Text:no text
 PT:3/4
-A:AB$ChangeZone | Cost$ 2 G T | TgtPrompt$ Choose target enchantment card in your graveyard | ValidTgts$ Enchantment.YouCtrl | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return target enchantment card from your graveyard to your hand.
+A:AB$ ChangeZone | Cost$ 2 G T | TgtPrompt$ Choose target enchantment card in your graveyard | ValidTgts$ Enchantment.YouCtrl | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return target enchantment card from your graveyard to your hand.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dowsing_shaman.jpg
 SetInfo:RAV|Uncommon|http://magiccards.info/scans/en/rav/159.jpg
diff --git a/res/cardsfolder/dragon_arch.txt b/res/cardsfolder/dragon_arch.txt
index ebcd8433175..e194cb1c9a9 100644
--- a/res/cardsfolder/dragon_arch.txt
+++ b/res/cardsfolder/dragon_arch.txt
@@ -2,7 +2,7 @@ Name:Dragon Arch
 ManaCost:5
 Types:Artifact
 Text:no text
-A:AB$ChangeZone | Cost$ 2 T | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature.MultiColor | ChangeNum$ 1 | SpellDescription$ You may put a multicolored creature card from your hand onto the battlefield
+A:AB$ ChangeZone | Cost$ 2 T | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature.MultiColor | ChangeNum$ 1 | SpellDescription$ You may put a multicolored creature card from your hand onto the battlefield.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dragon_arch.jpg
 SetInfo:APC|Uncommon|http://magiccards.info/scans/en/ap/135.jpg
diff --git a/res/cardsfolder/dreamscape_artist.txt b/res/cardsfolder/dreamscape_artist.txt
index 902f846d4cb..50c787a7fc4 100644
--- a/res/cardsfolder/dreamscape_artist.txt
+++ b/res/cardsfolder/dreamscape_artist.txt
@@ -3,7 +3,7 @@ ManaCost:1 U
 Types:Creature Human Spellshaper
 Text:no text
 PT:1/1
-A:AB$ChangeZone | Cost$ 2 U T Discard<1/Card> Sac<1/Land> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 2 | SpellDescription$ Search your library for up to two basic land cards and put them onto the battlefield. Then shuffle your library.
+A:AB$ ChangeZone | Cost$ 2 U T Discard<1/Card> Sac<1/Land> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 2 | SpellDescription$ Search your library for up to two basic land cards and put them onto the battlefield. Then shuffle your library.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dreamscape_artist.jpg
 SetInfo:PLC|Common|http://magiccards.info/scans/en/pc/40.jpg
diff --git a/res/cardsfolder/elvish_piper.txt b/res/cardsfolder/elvish_piper.txt
index ebd0ec2c34d..3935e273816 100644
--- a/res/cardsfolder/elvish_piper.txt
+++ b/res/cardsfolder/elvish_piper.txt
@@ -2,7 +2,7 @@ Name:Elvish Piper
 ManaCost:3 G
 Types:Creature Elf Shaman
 Text:no text
-A:AB$ChangeZone | Cost$ G T | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature | ChangeNum$ 1 | SpellDescription$ You may put a creature card from your hand onto the battlefield.
+A:AB$ ChangeZone | Cost$ G T | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature | ChangeNum$ 1 | SpellDescription$ You may put a creature card from your hand onto the battlefield.
 PT:1/1
 SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/9ed/en-us/card83072.jpg
diff --git a/res/cardsfolder/embermage_goblin.txt b/res/cardsfolder/embermage_goblin.txt
index 20d2b4abe9c..045845524ce 100644
--- a/res/cardsfolder/embermage_goblin.txt
+++ b/res/cardsfolder/embermage_goblin.txt
@@ -3,8 +3,8 @@ ManaCost:3 R
 Types:Creature Goblin Wizard
 Text:no text
 PT:1/1
-A:AB$DealDamage | Cost$ T | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a card named Embermage Goblin, reveal it, and put it into your hand. If you do, shuffle your library.
+A:AB$ DealDamage | Cost$ T | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a card named CARDNAME, reveal it, and put it into your hand. If you do, shuffle your library.
 SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Hand | ChangeType$ Card.namedEmbermage Goblin | ChangeNum$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/embermage_goblin.jpg
diff --git a/res/cardsfolder/ephemeron.txt b/res/cardsfolder/ephemeron.txt
index 8f576658b41..a5e90b0c5c4 100644
--- a/res/cardsfolder/ephemeron.txt
+++ b/res/cardsfolder/ephemeron.txt
@@ -4,7 +4,7 @@ Types:Creature Illusion
 Text:no text
 PT:4/4
 K:Flying
-A:AB$ChangeZone | Cost$ Discard<1/Card> | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.  
+A:AB$ ChangeZone | Cost$ Discard<1/Card> | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.  
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ephemeron.jpg
 SetInfo:EXO|Rare|http://magiccards.info/scans/en/ex/31.jpg
diff --git a/res/cardsfolder/escape_artist.txt b/res/cardsfolder/escape_artist.txt
index b48a294003e..e746921e938 100644
--- a/res/cardsfolder/escape_artist.txt
+++ b/res/cardsfolder/escape_artist.txt
@@ -4,7 +4,7 @@ Types:Creature Human Wizard
 Text:no text
 PT:1/1
 K:Unblockable
-A:AB$ChangeZone | Cost$ U Discard<1/Card> | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
+A:AB$ ChangeZone | Cost$ U Discard<1/Card> | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/escape_artist.jpg
 SetInfo:ODY|Common|http://magiccards.info/scans/en/od/84.jpg
diff --git a/res/cardsfolder/escape_routes.txt b/res/cardsfolder/escape_routes.txt
index ad7da3f26a6..aa1fd91d337 100644
--- a/res/cardsfolder/escape_routes.txt
+++ b/res/cardsfolder/escape_routes.txt
@@ -2,7 +2,7 @@ Name:Escape Routes
 ManaCost:2 U
 Types:Enchantment
 Text:no text
-A:AB$ChangeZone | Cost$ 2 U | ValidTgts$ Creature.White+YouCtrl,Creature.Black+YouCtrl | TgtPrompt$ Select target white or black creature you control | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target white or black creature you control to its owner's hand.
+A:AB$ ChangeZone | Cost$ 2 U | ValidTgts$ Creature.White+YouCtrl,Creature.Black+YouCtrl | TgtPrompt$ Select target white or black creature you control | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target white or black creature you control to its owner's hand.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/escape_routes.jpg
diff --git a/res/cardsfolder/eternal_dragon.txt b/res/cardsfolder/eternal_dragon.txt
index 5c40eeb81c1..64e11c38d13 100644
--- a/res/cardsfolder/eternal_dragon.txt
+++ b/res/cardsfolder/eternal_dragon.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:5/5
 K:Flying
 K:TypeCycling:Plains:2
-A:AB$ChangeZone | Cost$ 3 W W | Origin$ Graveyard | Destination$ Hand | ActivatingZone$ Graveyard | ActivatingPhases$ Upkeep | PlayerTurn$ True | SpellDescription$ Return Eternal Dragon from your graveyard to your hand. Activate this ability only during your upkeep.
+A:AB$ ChangeZone | Cost$ 3 W W | Origin$ Graveyard | Destination$ Hand | ActivatingZone$ Graveyard | ActivatingPhases$ Upkeep | PlayerTurn$ True | SpellDescription$ Return CARDNAME from your graveyard to your hand. Activate this ability only during your upkeep.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/eternal_dragon.jpg
 SetInfo:SCG|Rare|http://magiccards.info/scans/en/sc/12.jpg
diff --git a/res/cardsfolder/everbark_shaman.txt b/res/cardsfolder/everbark_shaman.txt
index 83ef34aaede..2c23df0933f 100644
--- a/res/cardsfolder/everbark_shaman.txt
+++ b/res/cardsfolder/everbark_shaman.txt
@@ -3,7 +3,7 @@ ManaCost:4 G
 Types:Creature Treefolk Shaman
 Text:no text
 PT:3/5
-A:AB$ChangeZone | Cost$ T ExileFromGrave<1/Treefolk>  | Origin$ Library | Tapped$ True | Destination$ Battlefield | ChangeType$ Forest | ChangeNum$ 2 | SpellDescription$ Search your library for two Forest cards and put them onto the battlefield tapped. Then shuffle your library.
+A:AB$ ChangeZone | Cost$ T ExileFromGrave<1/Treefolk>  | Origin$ Library | Tapped$ True | Destination$ Battlefield | ChangeType$ Forest | ChangeNum$ 2 | SpellDescription$ Search your library for two Forest cards and put them onto the battlefield tapped. Then shuffle your library.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/everbark_shaman.jpg
 SetInfo:MOR|Common|http://magiccards.info/scans/en/mt/121.jpg
diff --git a/res/cardsfolder/evolving_wilds.txt b/res/cardsfolder/evolving_wilds.txt
index 0794281a18b..5adeee7d836 100644
--- a/res/cardsfolder/evolving_wilds.txt
+++ b/res/cardsfolder/evolving_wilds.txt
@@ -2,7 +2,7 @@ Name:Evolving Wilds
 ManaCost:no cost
 Types:Land
 Text:no text
-A:AB$ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card and put it onto the battlefield tapped. Then shuffle your library.
+A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card and put it onto the battlefield tapped. Then shuffle your library.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/evolving_wilds.jpg
 SetInfo:ROE|Common|http://magiccards.info/scans/en/roe/228.jpg
diff --git a/res/cardsfolder/exile_into_darkness.txt b/res/cardsfolder/exile_into_darkness.txt
index 8939bc109a6..39031302a77 100644
--- a/res/cardsfolder/exile_into_darkness.txt
+++ b/res/cardsfolder/exile_into_darkness.txt
@@ -2,7 +2,7 @@ Name:Exile into Darkness
 ManaCost:4 B
 Types:Sorcery
 Text:no text
-A:SP$Sacrifice | Cost$ 4 B | ValidTgts$ Player | SacValid$ Creature.cmcLE3 | SacMessage$ creature with converted mana cost 3 or less | SpellDescription$ Target player sacrifices a creature with converted mana cost 3 or less.
+A:SP$ Sacrifice | Cost$ 4 B | ValidTgts$ Player | SacValid$ Creature.cmcLE3 | SacMessage$ creature with converted mana cost 3 or less | SpellDescription$ Target player sacrifices a creature with converted mana cost 3 or less.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Graveyard | IsPresent$ Card | PresentZone$ Hand | PresentPlayer$ Opponent | PresentCompare$ LTX | OptionalDecider$ You | Execute$ TrigReturn | TriggerDescription$ At the beginning of your upkeep, if you have more cards in hand than each opponent, you may return CARDNAME from your graveyard to your hand.
 SVar:X:Count$InYourHand
 SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Hand
diff --git a/res/cardsfolder/expedition_map.txt b/res/cardsfolder/expedition_map.txt
index 94479f69e55..c468a66f440 100644
--- a/res/cardsfolder/expedition_map.txt
+++ b/res/cardsfolder/expedition_map.txt
@@ -2,7 +2,7 @@ Name:Expedition Map
 ManaCost:1
 Types:Artifact
 Text:no text
-A:AB$ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Land | ChangeNum$ 1 | SpellDescription$ Search your library for a land card, reveal it, and put it into your hand. Then shuffle your library.
+A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Land | ChangeNum$ 1 | SpellDescription$ Search your library for a land card, reveal it, and put it into your hand. Then shuffle your library.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/expedition_map.jpg
 SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/201.jpg
diff --git a/res/cardsfolder/eye_of_ugin.txt b/res/cardsfolder/eye_of_ugin.txt
index d3d98d1ea3b..46890be019c 100644
--- a/res/cardsfolder/eye_of_ugin.txt
+++ b/res/cardsfolder/eye_of_ugin.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Legendary Land
 Text:Colorless Eldrazi spells you cast cost 2 less to cast.
 K:CostChange:Player:Less:2:Spell:colorless:Eldrazi:NoSpecial
-A:AB$ChangeZone | Cost$ 7 T | Origin$ Library | Destination$ Hand | ChangeType$ Creature.Colorless | ChangeNum$ 1 | SpellDescription$ Search your library for a colorless creature card, reveal it, and put it into your hand. Then shuffle your library.
+A:AB$ ChangeZone | Cost$ 7 T | Origin$ Library | Destination$ Hand | ChangeType$ Creature.Colorless | ChangeNum$ 1 | SpellDescription$ Search your library for a colorless creature card, reveal it, and put it into your hand. Then shuffle your library.
 SVar:RemRandomDeck:True
 SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/eye_of_ugin.jpg
diff --git a/res/cardsfolder/faceless_devourer.txt b/res/cardsfolder/faceless_devourer.txt
index 59ec1404584..8e10ce19181 100644
--- a/res/cardsfolder/faceless_devourer.txt
+++ b/res/cardsfolder/faceless_devourer.txt
@@ -4,7 +4,7 @@ Types:Creature Nightmare Horror
 Text:no text
 PT:2/1
 K:Shadow
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When Faceless Devourer enters the battlefield, exile another target creature with shadow.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile another target creature with shadow.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME leaves the battlefield, return the exiled card to the battlefield under its owner's control.
 SVar:TrigExile:AB$ChangeZone | Cost$ 0 | TargetMin$ 1 | IsCurse$ True | ValidTgts$ Creature.withShadow+Other | TgtPrompt$ Choose target creature with shadow other than Faceless Devourer. | RememberTargets$ True | ForgetOtherTargets$ True | Origin$ Battlefield | Destination$ Exile
 SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield
diff --git a/res/cardsfolder/faerie_macabre.txt b/res/cardsfolder/faerie_macabre.txt
index c7dd18afd5d..c5a3e29da92 100644
--- a/res/cardsfolder/faerie_macabre.txt
+++ b/res/cardsfolder/faerie_macabre.txt
@@ -4,7 +4,7 @@ Types:Creature Faerie Rogue
 Text:no text
 PT:2/2
 K:Flying
-A:AB$ChangeZone | Cost$ Discard<1/CARDNAME> | ActivatingZone$ Hand | Origin$ Graveyard | Destination$ Exile | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Select up to two target cards in graveyards | ValidTgts$ Card | SpellDescription$ Exile up to two target cards from graveyards.
+A:AB$ ChangeZone | Cost$ Discard<1/CARDNAME> | ActivatingZone$ Hand | Origin$ Graveyard | Destination$ Exile | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Select up to two target cards in graveyards | ValidTgts$ Card | SpellDescription$ Exile up to two target cards from graveyards.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/faerie_macabre.jpg
 SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/66.jpg
diff --git a/res/cardsfolder/fallen_ideal.txt b/res/cardsfolder/fallen_ideal.txt
index 0b9ee8affce..9982e1b4bf2 100644
--- a/res/cardsfolder/fallen_ideal.txt
+++ b/res/cardsfolder/fallen_ideal.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 K:enPump:Flying
-A:AB$Pump | Cost$ Sac<1/Creature> | Defined$ Enchanted | NumAtt$ +2 | NumDef$ +1 | SpellDescription$ Enchanted creature gets +2/+1 until end of turn.
+A:AB$ Pump | Cost$ Sac<1/Creature> | Defined$ Enchanted | NumAtt$ +2 | NumDef$ +1 | SpellDescription$ Enchanted creature gets +2/+1 until end of turn.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, return CARDNAME to its owner's hand.
 SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/fauna_shaman.txt b/res/cardsfolder/fauna_shaman.txt
index 7a23c04652c..61255330875 100644
--- a/res/cardsfolder/fauna_shaman.txt
+++ b/res/cardsfolder/fauna_shaman.txt
@@ -3,7 +3,7 @@ ManaCost:1 G
 Types:Creature Elf Shaman
 Text:no text
 PT:2/2
-A:AB$ChangeZone | Cost$ G T Discard<1/Creature> | Origin$ Library | Destination$ Hand | ChangeType$ Creature | ChangeNum$ 1 | SpellDescription$ Search your library for a Creature card and put it into your hand. Then shuffle your library.
+A:AB$ ChangeZone | Cost$ G T Discard<1/Creature> | Origin$ Library | Destination$ Hand | ChangeType$ Creature | ChangeNum$ 1 | SpellDescription$ Search your library for a Creature card and put it into your hand. Then shuffle your library.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fauna_shaman.jpg
 SetInfo:M11|Rare|http://magiccards.info/scans/en/m11/172.jpg
diff --git a/res/cardsfolder/feldons_cane.txt b/res/cardsfolder/feldons_cane.txt
index 00ecb67c46e..e99ac25ad97 100644
--- a/res/cardsfolder/feldons_cane.txt
+++ b/res/cardsfolder/feldons_cane.txt
@@ -2,7 +2,7 @@ Name:Feldon's Cane
 ManaCost:1
 Types:Artifact
 Text:no text
-A:AB$ChangeZoneAll | Cost$ T Exile<1/CARDNAME> | ChangeType$ Card.YouOwn | Origin$ Graveyard | Destination$ Library | Shuffle$ True | SpellDescription$ Shuffle your graveyard into your library.
+A:AB$ ChangeZoneAll | Cost$ T Exile<1/CARDNAME> | ChangeType$ Card.YouOwn | Origin$ Graveyard | Destination$ Library | Shuffle$ True | SpellDescription$ Shuffle your graveyard into your library.
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/feldons_cane.jpg
diff --git a/res/cardsfolder/fencer_clique.txt b/res/cardsfolder/fencer_clique.txt
index 68326e84d83..517abb6b299 100644
--- a/res/cardsfolder/fencer_clique.txt
+++ b/res/cardsfolder/fencer_clique.txt
@@ -4,7 +4,7 @@ Types:Creature Faerie Soldier
 Text:no text
 PT:3/2
 K:Flying
-A:AB$ChangeZone | Cost$ U | Origin$ Battlefield | Destination $ Library | LibraryPosition$ 0 | SpellDescription$ Put CARDNAME on top of its owner's library.
+A:AB$ ChangeZone | Cost$ U | Origin$ Battlefield | Destination $ Library | LibraryPosition$ 0 | SpellDescription$ Put CARDNAME on top of its owner's library.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fencer_clique.jpg
 SetInfo:MOR|Common|http://magiccards.info/scans/en/mt/33.jpg
diff --git a/res/cardsfolder/fertilid.txt b/res/cardsfolder/fertilid.txt
index e3d2880c68e..0e0238571ed 100644
--- a/res/cardsfolder/fertilid.txt
+++ b/res/cardsfolder/fertilid.txt
@@ -4,7 +4,7 @@ Types:Creature Elemental
 Text:no text
 PT:0/0
 K:etbCounter:P1P1:2
-A:AB$ChangeZone | Cost$ 1 G SubCounter<1/P1P1> | ValidTgts$ Player | Defined$ Targeted | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Target player searches his or her library for a basic land card and puts it onto the battlefield tapped. Then that player shuffles his or her library.
+A:AB$ ChangeZone | Cost$ 1 G SubCounter<1/P1P1> | ValidTgts$ Player | Defined$ Targeted | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Target player searches his or her library for a basic land card and puts it onto the battlefield tapped. Then that player shuffles his or her library.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fertilid.jpg
 SetInfo:MOR|Common|http://magiccards.info/scans/en/mt/122.jpg
diff --git a/res/cardsfolder/fiery_mantle.txt b/res/cardsfolder/fiery_mantle.txt
index 3ce8dca30f9..d90dbe3d0a4 100644
--- a/res/cardsfolder/fiery_mantle.txt
+++ b/res/cardsfolder/fiery_mantle.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 K:enPump:+0/+0
-A:AB$Pump | Cost$ R | Defined$ Enchanted | NumAtt$ +1 | SpellDescription$ Enchanted creature gets +1/+0 until end of turn.
+A:AB$ Pump | Cost$ R | Defined$ Enchanted | NumAtt$ +1 | SpellDescription$ Enchanted creature gets +1/+0 until end of turn.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, return CARDNAME to its owner's hand.
 SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand
 SVar:Rarity:Common
diff --git a/res/cardsfolder/firemane_angel.txt b/res/cardsfolder/firemane_angel.txt
index 06108d00854..61886e0c4be 100644
--- a/res/cardsfolder/firemane_angel.txt
+++ b/res/cardsfolder/firemane_angel.txt
@@ -5,8 +5,8 @@ Text:no text
 PT:4/3
 K:Flying
 K:First Strike
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield,Graveyard | OptionalDecider$ You | Execute$ TrigGainLife | TriggerDescription$ At the beginning of your upkeep, you may gain 1 life.\r\nAt the beginning of your upkeep, if CARDNAME is in your graveyard, you may gain 1 life.
-A:AB$ChangeZone | Cost$ 6 R R W W | Origin$ Graveyard | Destination$ Battlefield | ActivatingZone$ Graveyard | PlayerTurn$ True | ActivatingPhases$ Upkeep | SpellDescription$ Return Firemane Angel from your graveyard to the battlefield. Activate this ability only during your upkeep.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield,Graveyard | OptionalDecider$ You | Execute$ TrigGainLife | TriggerDescription$ At the beginning of your upkeep, if CARDNAME is in your graveyard or on the battlefield, you may gain 1 life.
+A:AB$ ChangeZone | Cost$ 6 R R W W | Origin$ Graveyard | Destination$ Battlefield | ActivatingZone$ Graveyard | PlayerTurn$ True | ActivatingPhases$ Upkeep | SpellDescription$ Return Firemane Angel from your graveyard to the battlefield. Activate this ability only during your upkeep.
 SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 1
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/firemane_angel.jpg
diff --git a/res/cardsfolder/fleeting_image.txt b/res/cardsfolder/fleeting_image.txt
index daa9c700fb1..60aca115bec 100644
--- a/res/cardsfolder/fleeting_image.txt
+++ b/res/cardsfolder/fleeting_image.txt
@@ -4,7 +4,7 @@ Types:Creature Illusion
 Text:no text
 PT:2/1
 K:Flying
-A:AB$ChangeZone | Cost$ 1 U | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
+A:AB$ ChangeZone | Cost$ 1 U | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fleeting_image.jpg
 SetInfo:8ED|Rare|http://magiccards.info/scans/en/8e/79.jpg
diff --git a/res/cardsfolder/fleshwrither.txt b/res/cardsfolder/fleshwrither.txt
index e299b370fb5..33bfbe22f99 100644
--- a/res/cardsfolder/fleshwrither.txt
+++ b/res/cardsfolder/fleshwrither.txt
@@ -3,7 +3,7 @@ ManaCost:2 B B
 Types:Creature Horror
 Text:no text
 PT:3/3
-A:AB$ChangeZone | Cost$ 1 B B Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature.cmcEQ4 | ChangeNum$ 1 | SorcerySpeed$ True | SpellDescription$ Transfigure 1 B B ( 1 B B , Sacrifice this creature: Search your library for a creature card with the same converted mana cost as this creature and put that card onto the battlefield. Then shuffle your library. Transfigure only as a sorcery.)
+A:AB$ ChangeZone | Cost$ 1 B B Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature.cmcEQ4 | ChangeNum$ 1 | SorcerySpeed$ True | SpellDescription$ Transfigure 1 B B ( 1 B B , Sacrifice this creature: Search your library for a creature card with the same converted mana cost as this creature and put that card onto the battlefield. Then shuffle your library. Transfigure only as a sorcery.)
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fleshwrither.jpg
 SetInfo:FUT|Uncommon|http://magiccards.info/scans/en/fut/84.jpg
diff --git a/res/cardsfolder/flood_plain.txt b/res/cardsfolder/flood_plain.txt
index f02877d55c3..25570163747 100644
--- a/res/cardsfolder/flood_plain.txt
+++ b/res/cardsfolder/flood_plain.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land
 Text:no text
 K:CARDNAME enters the battlefield tapped.
-A:AB$ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Plains,Island | ChangeNum$ 1 | SpellDescription$ Search your library for a Plains or Island card and put it onto the battlefield. Then shuffle your library.
+A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Plains,Island | ChangeNum$ 1 | SpellDescription$ Search your library for a Plains or Island card and put it onto the battlefield. Then shuffle your library.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/flood_plain.jpg
 SetInfo:MIR|Uncommon|http://magiccards.info/scans/en/mr/291.jpg
diff --git a/res/cardsfolder/flooded_shoreline.txt b/res/cardsfolder/flooded_shoreline.txt
index 7b86c9af6fb..60687dd936f 100644
--- a/res/cardsfolder/flooded_shoreline.txt
+++ b/res/cardsfolder/flooded_shoreline.txt
@@ -2,7 +2,7 @@ Name:Flooded Shoreline
 ManaCost:U U
 Types:Enchantment
 Text:no text
-A:AB$ChangeZone | Cost$ U U Return<2/Island> | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand.
+A:AB$ ChangeZone | Cost$ U U Return<2/Island> | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/flooded_shoreline.jpg
diff --git a/res/cardsfolder/flooded_strand.txt b/res/cardsfolder/flooded_strand.txt
index 400eb312cf6..c4b5ca7146d 100644
--- a/res/cardsfolder/flooded_strand.txt
+++ b/res/cardsfolder/flooded_strand.txt
@@ -2,7 +2,7 @@ Name:Flooded Strand
 ManaCost:no cost
 Types:Land
 Text:no text
-A:AB$ChangeZone | Cost$ T PayLife<1> Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Plains,Island | ChangeNum$ 1 | SpellDescription$ Search your library for a Plains or Island card and put it onto the battlefield. Then shuffle your library.
+A:AB$ ChangeZone | Cost$ T PayLife<1> Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Plains,Island | ChangeNum$ 1 | SpellDescription$ Search your library for a Plains or Island card and put it onto the battlefield. Then shuffle your library.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/flooded_strand.jpg
 SetInfo:ONS|Rare|http://magiccards.info/scans/en/on/316.jpg
diff --git a/res/cardsfolder/fortitude.txt b/res/cardsfolder/fortitude.txt
index b2af2cb8da2..d4f0a0e6092 100644
--- a/res/cardsfolder/fortitude.txt
+++ b/res/cardsfolder/fortitude.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 K:enPump:0/0
-A:AB$Regenerate | Cost$ Sac<1/Forest> | Defined$ Enchanted | SpellDescription$ Regenerate enchanted creature.
+A:AB$ Regenerate | Cost$ Sac<1/Forest> | Defined$ Enchanted | SpellDescription$ Regenerate enchanted creature.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | TriggerZones$ Graveyard | Execute$ TrigBounce | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, return CARDNAME to its owner's hand.
 SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand | Defined$ Self
 SVar:Rarity:Common
diff --git a/res/cardsfolder/foul_familiar.txt b/res/cardsfolder/foul_familiar.txt
index 2ab450b60b7..1a2e2abc73d 100644
--- a/res/cardsfolder/foul_familiar.txt
+++ b/res/cardsfolder/foul_familiar.txt
@@ -4,7 +4,7 @@ Types:Creature Spirit
 Text:no text
 PT:3/1
 K:CARDNAME can't block.
-A:AB$ChangeZone | Cost$ B PayLife<1> | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
+A:AB$ ChangeZone | Cost$ B PayLife<1> | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/foul_familiar.jpg
 SetInfo:ICE|Common|http://magiccards.info/scans/en/ia/14.jpg
diff --git a/res/cardsfolder/freyalises_charm.txt b/res/cardsfolder/freyalises_charm.txt
index 7027a2b7752..06f1217092a 100644
--- a/res/cardsfolder/freyalises_charm.txt
+++ b/res/cardsfolder/freyalises_charm.txt
@@ -2,7 +2,7 @@ Name:Freyalise's Charm
 ManaCost:G G
 Types:Enchantment
 Text:no text
-A:AB$ChangeZone | Cost$ G G | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
+A:AB$ ChangeZone | Cost$ G G | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
 T:Mode$ SpellCast | ValidCard$ Card.Black+YouDontCtrl | TriggerZones$ Battlefield | Execute$ TrigDraw | OptionalDecider$ You | TriggerDescription$ Whenever an opponent casts a black spell, you may pay G G. If you do, you draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ G G | Defined$ You | NumCards$ 1
 SVar:RemRandomDeck:True
diff --git a/res/cardsfolder/frontier_guide.txt b/res/cardsfolder/frontier_guide.txt
index be8f3cabd32..6227a646aa8 100644
--- a/res/cardsfolder/frontier_guide.txt
+++ b/res/cardsfolder/frontier_guide.txt
@@ -3,7 +3,7 @@ ManaCost:1 G
 Types:Creature Elf Scout
 PT:1/1
 Text:no text
-A:AB$ChangeZone | Cost$ 3 G T | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card and put it onto the battlefield tapped.  Then shuffle your library.
+A:AB$ ChangeZone | Cost$ 3 G T | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card and put it onto the battlefield tapped.  Then shuffle your library.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/Frontier_guide.jpg
 SetInfo:ZEN|Uncommon|http://magiccards.info/scans/en/zen/161.jpg
diff --git a/res/cardsfolder/gangrenous_goliath.txt b/res/cardsfolder/gangrenous_goliath.txt
index 8cb374260c8..5cbf48f53df 100644
--- a/res/cardsfolder/gangrenous_goliath.txt
+++ b/res/cardsfolder/gangrenous_goliath.txt
@@ -3,7 +3,7 @@ ManaCost:3 B B
 Types:Creature Zombie Giant
 Text:no text
 PT:4/4
-A:AB$ChangeZone | Cost$tapXType<3/Cleric> | Origin$ Graveyard | Destination$ Hand | ActivatingZone$ Graveyard | SpellDescription$ Return Gangrenous Goliath from your graveyard to your hand.
+A:AB$ ChangeZone | Cost$tapXType<3/Cleric> | Origin$ Graveyard | Destination$ Hand | ActivatingZone$ Graveyard | SpellDescription$ Return CARDNAME from your graveyard to your hand.
 Var:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gangrenous_goliath.jpg
diff --git a/res/cardsfolder/genju_of_the_realm.txt b/res/cardsfolder/genju_of_the_realm.txt
index cd34d8d0860..69a31cf92f5 100644
--- a/res/cardsfolder/genju_of_the_realm.txt
+++ b/res/cardsfolder/genju_of_the_realm.txt
@@ -5,7 +5,7 @@ Text:no text
 K:Enchant Land
 #This doesn't work because I think abilities are added before CardFactory is processed, which clears this ability.  Same problem as Caribou Range.
 #Interestingly enough, the trigger works
-A:AB$Animate | Cost$ 2 | Defined$ Enchanted | Power$ 8 | Toughness$ 12 | Types$ Creature,Legendary,Spirit | Keywords$ Trample | SpellDescription$ Enchanted land becomes a legendary 8/12 Spirit creature with trample until end of turn. It's still a land.
+A:AB$ Animate | Cost$ 2 | Defined$ Enchanted | Power$ 8 | Toughness$ 12 | Types$ Creature,Legendary,Spirit | Keywords$ Trample | SpellDescription$ Enchanted land becomes a legendary 8/12 Spirit creature with trample until end of turn. It's still a land.
 T:Mode$ ChangesZone | ValidCard$ Card.AttachedBy | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigReturnOwner | OptionalDecider$ You | TriggerDescription$ When enchanted land is put into a graveyard, you may return CARDNAME from your graveyard to your hand.
 SVar:TrigReturnOwner:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Hand
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/geth_lord_of_the_vault.txt b/res/cardsfolder/geth_lord_of_the_vault.txt
index 208b189ffab..5ec3e58ec85 100644
--- a/res/cardsfolder/geth_lord_of_the_vault.txt
+++ b/res/cardsfolder/geth_lord_of_the_vault.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Zombie
 Text:no text
 PT:5/5
 K:Intimidate
-A:AB$ChangeZone | Cost$ X B | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | TgtPrompt$ Choose target creature card in an opponent's graveyard | ValidTgts$ Creature.YouDontCtrl,Artifact.YouDontCtrl | Tapped$ True | SubAbility$ SVar=DBMill | SpellDescription$ Put target artifact or creature card with converted mana cost X from an opponent's graveyard onto the battlefield under your control tapped. Then that player puts the top X cards of his or her library into his or her graveyard.
+A:AB$ ChangeZone | Cost$ X B | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | TgtPrompt$ Choose target creature card in an opponent's graveyard | ValidTgts$ Creature.YouDontCtrl,Artifact.YouDontCtrl | Tapped$ True | SubAbility$ SVar=DBMill | SpellDescription$ Put target artifact or creature card with converted mana cost X from an opponent's graveyard onto the battlefield under your control tapped. Then that player puts the top X cards of his or her library into his or her graveyard.
 SVar:DBMill:DB$Mill | NumCards$ X | Defined$ Opponent
 SVar:X:Targeted$CardManaCost
 SVar:Rarity:Mythic
diff --git a/res/cardsfolder/ghost_town.txt b/res/cardsfolder/ghost_town.txt
index 6053082e315..b2c46f56a1e 100644
--- a/res/cardsfolder/ghost_town.txt
+++ b/res/cardsfolder/ghost_town.txt
@@ -2,8 +2,8 @@ Name:Ghost Town
 ManaCost:no cost
 Types:Land
 Text:no text
-A:AB$Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
-A:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | OpponentTurn$ True | SpellDescription$ Return CARDNAME to its owner's hand. Activate this ability only if it's not your turn.
+A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
+A:AB$ ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | OpponentTurn$ True | SpellDescription$ Return CARDNAME to its owner's hand. Activate this ability only if it's not your turn.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ghost_town.jpg
diff --git a/res/cardsfolder/giant_trap_door_spider.txt b/res/cardsfolder/giant_trap_door_spider.txt
index cf0dd69f03a..e9980499005 100644
--- a/res/cardsfolder/giant_trap_door_spider.txt
+++ b/res/cardsfolder/giant_trap_door_spider.txt
@@ -3,7 +3,7 @@ ManaCost:1 R G
 Types:Creature Spider
 Text:no text
 PT:2/3
-A:AB$ChangeZone | Cost$ 1 R G T | ValidTgts$ Creature.attacking+YouDontCtrl+withoutFlying | TgtPrompt$ Select target creature without flying that's attacking you | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile Giant Trap Door Spider and target creature without flying that's attacking you. | SubAbility$ SVar=ExileME
+A:AB$ ChangeZone | Cost$ 1 R G T | ValidTgts$ Creature.attacking+YouDontCtrl+withoutFlying | TgtPrompt$ Select target creature without flying that's attacking you | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile CARDNAME and target creature without flying that's attacking you. | SubAbility$ SVar=ExileME
 SVar:ExileME:DB$ChangeZone | Origin$ Battlefield | Destination$ Exile | Defined$ Self
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/goblin_wizard.txt b/res/cardsfolder/goblin_wizard.txt
index db9b716465c..d8c212eab39 100644
--- a/res/cardsfolder/goblin_wizard.txt
+++ b/res/cardsfolder/goblin_wizard.txt
@@ -3,8 +3,8 @@ ManaCost:2 R R
 Types:Creature Goblin Wizard
 Text:no text
 PT:1/1
-A:AB$ChangeZone | Cost$ T | Origin$ Hand | Destination$ Battlefield | ChangeType$ Permanent.Goblin | ChangeNum$ 1 | SpellDescription$ You may put a Goblin permanent card from your hand onto the battlefield.
-A:AB$Pump | Cost$ R | ValidTgts$ Permanent.Goblin | TgtPrompt$ Select target Goblin | KW$ Protection from white | SpellDescription$ Target Goblin gains protection from white until end of turn.
+A:AB$ ChangeZone | Cost$ T | Origin$ Hand | Destination$ Battlefield | ChangeType$ Permanent.Goblin | ChangeNum$ 1 | SpellDescription$ You may put a Goblin permanent card from your hand onto the battlefield.
+A:AB$ Pump | Cost$ R | ValidTgts$ Permanent.Goblin | TgtPrompt$ Select target Goblin | KW$ Protection from white | SpellDescription$ Target Goblin gains protection from white until end of turn.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_wizard.jpg
 SetInfo:DRK|Rare|http://magiccards.info/scans/en/dk/68.jpg
diff --git a/res/cardsfolder/golgari_rot_farm.txt b/res/cardsfolder/golgari_rot_farm.txt
index f218331b58b..8dbe3b83272 100644
--- a/res/cardsfolder/golgari_rot_farm.txt
+++ b/res/cardsfolder/golgari_rot_farm.txt
@@ -2,7 +2,7 @@ Name:Golgari Rot Farm
 ManaCost:no cost
 Types:Land
 Text:no text
-K:Golgari Rot Farm enters the battlefield tapped.
+K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ B G | SpellDescription$ Add B G to your mana pool.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
 SVar:TrigReturn:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl
diff --git a/res/cardsfolder/grasslands.txt b/res/cardsfolder/grasslands.txt
index 2809727cdac..12ff92851a6 100644
--- a/res/cardsfolder/grasslands.txt
+++ b/res/cardsfolder/grasslands.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land
 Text:no text
 K:CARDNAME enters the battlefield tapped.
-A:AB$ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Forest,Plains | ChangeNum$ 1 | SpellDescription$ Search your library for a Forest or Plains card and put it onto the battlefield. Then shuffle your library.
+A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Forest,Plains | ChangeNum$ 1 | SpellDescription$ Search your library for a Forest or Plains card and put it onto the battlefield. Then shuffle your library.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/grasslands.jpg
 SetInfo:MIR|Uncommon|http://magiccards.info/scans/en/mr/296.jpg
diff --git a/res/cardsfolder/gravespawn_sovereign.txt b/res/cardsfolder/gravespawn_sovereign.txt
index 0228b6bd8f9..95dbfa14b8c 100644
--- a/res/cardsfolder/gravespawn_sovereign.txt
+++ b/res/cardsfolder/gravespawn_sovereign.txt
@@ -3,7 +3,7 @@ ManaCost:4 B B
 Types:Creature Zombie
 Text:no text
 PT:3/3
-A:AB$ChangeZone | Cost$ tapXType<5/Zombie> | TgtPrompt$ Choose target creature card in a graveyard | GainControl$ True | ValidTgts$ Creature | Origin$ Graveyard | Destination$ Battlefield | SpellDescription$ Put target creature card from a graveyard onto the battlefield under your control.
+A:AB$ ChangeZone | Cost$ tapXType<5/Zombie> | TgtPrompt$ Choose target creature card in a graveyard | GainControl$ True | ValidTgts$ Creature | Origin$ Graveyard | Destination$ Battlefield | SpellDescription$ Put target creature card from a graveyard onto the battlefield under your control.
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gravespawn_sovereign.jpg
diff --git a/res/cardsfolder/greenseeker.txt b/res/cardsfolder/greenseeker.txt
index b23afd52758..8366dc68465 100644
--- a/res/cardsfolder/greenseeker.txt
+++ b/res/cardsfolder/greenseeker.txt
@@ -3,7 +3,7 @@ ManaCost:G
 Types:Creature Elf Spellshaper
 Text:no text
 PT:1/1
-A:AB$ChangeZone | Cost$ G T Discard<1/Card> | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.
+A:AB$ ChangeZone | Cost$ G T Discard<1/Card> | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/greenseeker.jpg
diff --git a/res/cardsfolder/groundskeeper.txt b/res/cardsfolder/groundskeeper.txt
index f429685550e..c591a9f19a0 100644
--- a/res/cardsfolder/groundskeeper.txt
+++ b/res/cardsfolder/groundskeeper.txt
@@ -3,7 +3,7 @@ ManaCost:G
 Types:Creature Human Druid
 Text:no text
 PT:1/1
-A:AB$ChangeZone | Cost$ 1 G | TgtPrompt$ Choose target basic land in your graveyard | ValidTgts$ Land.Basic | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return target basic land card from your graveyard to your hand.
+A:AB$ ChangeZone | Cost$ 1 G | TgtPrompt$ Choose target basic land in your graveyard | ValidTgts$ Land.Basic | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return target basic land card from your graveyard to your hand.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/groundskeeper.jpg
 SetInfo:MMQ|Uncommon|http://magiccards.info/scans/en/mm/250.jpg
diff --git a/res/cardsfolder/gruul_turf.txt b/res/cardsfolder/gruul_turf.txt
index ca51f69f8fb..12fe5203c9c 100644
--- a/res/cardsfolder/gruul_turf.txt
+++ b/res/cardsfolder/gruul_turf.txt
@@ -2,7 +2,7 @@ Name:Gruul Turf
 ManaCost:no cost
 Types:Land
 Text:no text
-K:Gruul Turf enters the battlefield tapped.
+K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ R G | SpellDescription$ Add R G to your mana pool.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
 SVar:TrigReturn:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl
diff --git a/res/cardsfolder/hammer_of_bogardan.txt b/res/cardsfolder/hammer_of_bogardan.txt
index 6920e4c00c3..fbe78d875b1 100644
--- a/res/cardsfolder/hammer_of_bogardan.txt
+++ b/res/cardsfolder/hammer_of_bogardan.txt
@@ -2,8 +2,8 @@ Name:Hammer of Bogardan
 ManaCost:1 R R
 Types:Sorcery
 Text:no text
-A:SP$DealDamage | Cost$ 1 R R | Tgt$ TgtCP | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to target creature or player.
-A:AB$ChangeZone | Cost$ 2 R R R | Origin$ Graveyard | Destination$ Hand | ActivatingZone$ Graveyard | ActivatingPhases$ Upkeep | PlayerTurn$ True | SpellDescription$ Return Hammer of Bogardan from your graveyard to your hand. Activate this ability only during your upkeep.
+A:SP$ DealDamage | Cost$ 1 R R | Tgt$ TgtCP | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to target creature or player.
+A:AB$ ChangeZone | Cost$ 2 R R R | Origin$ Graveyard | Destination$ Hand | ActivatingZone$ Graveyard | ActivatingPhases$ Upkeep | PlayerTurn$ True | SpellDescription$ Return CARDNAME from your graveyard to your hand. Activate this ability only during your upkeep.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hammer_of_bogardan.jpg
 SetInfo:8ED|Rare|http://magiccards.info/scans/en/8e/193.jpg
diff --git a/res/cardsfolder/haunted_crossroads.txt b/res/cardsfolder/haunted_crossroads.txt
index b9533a9cb3d..4c1b33bda98 100644
--- a/res/cardsfolder/haunted_crossroads.txt
+++ b/res/cardsfolder/haunted_crossroads.txt
@@ -2,7 +2,7 @@ Name:Haunted Crossroads
 ManaCost:2 B
 Types:Enchantment
 Text:no text
-A:AB$ChangeZone | Cost$ B | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | Origin$ Graveyard | Destination$ Library | SpellDescription$ Put target creature card from your graveyard on top of your library.
+A:AB$ ChangeZone | Cost$ B | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | Origin$ Graveyard | Destination$ Library | SpellDescription$ Put target creature card from your graveyard on top of your library.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/haunted_crossroads.jpg
diff --git a/res/cardsfolder/horizon_spellbomb.txt b/res/cardsfolder/horizon_spellbomb.txt
index e88a39612aa..9295dd9c086 100644
--- a/res/cardsfolder/horizon_spellbomb.txt
+++ b/res/cardsfolder/horizon_spellbomb.txt
@@ -2,7 +2,7 @@ Name:Horizon Spellbomb
 ManaCost:1
 Types:Artifact
 Text:no text
-A:AB$ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | ChangeType$ Land.Basic | Origin$ Library | Destination$ Hand | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.
+A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | ChangeType$ Land.Basic | Origin$ Library | Destination$ Hand | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigDraw | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, you may pay G. If you do, draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ G | NumCards$ 1
 SVar:Rarity:Common
diff --git a/res/cardsfolder/hua_tuo_honored_physician.txt b/res/cardsfolder/hua_tuo_honored_physician.txt
index 61774e9fd71..002be60e43a 100644
--- a/res/cardsfolder/hua_tuo_honored_physician.txt
+++ b/res/cardsfolder/hua_tuo_honored_physician.txt
@@ -3,7 +3,7 @@ ManaCost:1 G G
 Types:Legendary Creature Human
 Text:no text
 PT:1/2
-A:AB$ChangeZone | Cost$ T | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | Origin$ Graveyard | Destination$ Library | PlayerTurn$ True | ActivatingPhases$ Upkeep,Draw,Main1,BeginCombat | SpellDescription$ Put target creature card from your graveyard on top of your library. Activate this ability only during your turn, before attackers are declared.
+A:AB$ ChangeZone | Cost$ T | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | Origin$ Graveyard | Destination$ Library | PlayerTurn$ True | ActivatingPhases$ Upkeep,Draw,Main1,BeginCombat | SpellDescription$ Put target creature card from your graveyard on top of your library. Activate this ability only during your turn, before attackers are declared.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hua_tuo_honored_physician.jpg
diff --git a/res/cardsfolder/ink_eyes_servant_of_oni.txt b/res/cardsfolder/ink_eyes_servant_of_oni.txt
index ceb3524da90..d95af96b5b4 100644
--- a/res/cardsfolder/ink_eyes_servant_of_oni.txt
+++ b/res/cardsfolder/ink_eyes_servant_of_oni.txt
@@ -3,10 +3,10 @@ ManaCost:4 B B
 Types:Legendary Creature Rat Ninja
 Text:no text
 PT:5/4
-A:AB$ChangeZone | Cost$ 3 B B Return<1/Creature.attacking+unblocked+YouCtrl> | CostDesc$ Ninjutsu 3 B B | ActivatingZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ (3 B B, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)
+A:AB$ ChangeZone | Cost$ 3 B B Return<1/Creature.attacking+unblocked+YouCtrl> | CostDesc$ Ninjutsu 3 B B | ActivatingZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ (3 B B, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | Execute$ TrigAnimate | OptionalDecider$ You | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may put target creature card from that player's graveyard onto the battlefield under your control.
 SVar:TrigAnimate:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | TgtPrompt$ Choose target creature card in an opponent's graveyard | ValidTgts$ Creature.YouDontCtrl | SpellDescription$ Put target creature card from an opponent's graveyard onto the battlefield under your control.
-A:AB$Regenerate | Cost$ 1 B | SpellDescription$ Regenerate CARDNAME.
+A:AB$ Regenerate | Cost$ 1 B | SpellDescription$ Regenerate CARDNAME.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ink_eyes_servant_of_oni.jpg
diff --git a/res/cardsfolder/izzet_boilerworks.txt b/res/cardsfolder/izzet_boilerworks.txt
index 439628c148f..a1f1763bbfe 100644
--- a/res/cardsfolder/izzet_boilerworks.txt
+++ b/res/cardsfolder/izzet_boilerworks.txt
@@ -2,7 +2,7 @@ Name:Izzet Boilerworks
 ManaCost:no cost
 Types:Land
 Text:no text
-K:Izzet Boilerworks enters the battlefield tapped.
+K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ U R | SpellDescription$ Add U R to your mana pool.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
 SVar:TrigReturn:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl
diff --git a/res/cardsfolder/jesters_cap.txt b/res/cardsfolder/jesters_cap.txt
index 1d0544a8920..bd72f8f43f2 100644
--- a/res/cardsfolder/jesters_cap.txt
+++ b/res/cardsfolder/jesters_cap.txt
@@ -2,7 +2,7 @@ Name:Jester's Cap
 ManaCost:4
 Types:Artifact
 Text:no text
-A:AB$ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | ValidTgts$ Player | Origin$ Library | Destination$ Exile | ChangeType$ Card | ChangeNum$ 3 | IsCurse$ True | SpellDescription$ Search target player's library for three cards and exile them. Then that player shuffles his or her library.
+A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | ValidTgts$ Player | Origin$ Library | Destination$ Exile | ChangeType$ Card | ChangeNum$ 3 | IsCurse$ True | SpellDescription$ Search target player's library for three cards and exile them. Then that player shuffles his or her library.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jesters_cap.jpg
diff --git a/res/cardsfolder/journeyers_kite.txt b/res/cardsfolder/journeyers_kite.txt
index 00d3d2746a0..d266a2571cc 100644
--- a/res/cardsfolder/journeyers_kite.txt
+++ b/res/cardsfolder/journeyers_kite.txt
@@ -2,7 +2,7 @@ Name:Journeyer's Kite
 ManaCost:2
 Types:Artifact
 Text:no text
-A:AB$ChangeZone | Cost$ 3 T | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.
+A:AB$ ChangeZone | Cost$ 3 T | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/journeyers_kite.jpg
 SetInfo:CHK|Rare|http://magiccards.info/scans/en/chk/257.jpg
diff --git a/res/cardsfolder/junktroller.txt b/res/cardsfolder/junktroller.txt
index 262d9ee4f50..ed832df057c 100644
--- a/res/cardsfolder/junktroller.txt
+++ b/res/cardsfolder/junktroller.txt
@@ -4,7 +4,7 @@ Types:Artifact Creature Golem
 Text:no text
 PT:0/6
 K:Defender
-A:AB$ChangeZone | Cost$ T | ValidTgts$ Card | TgtPrompt$ Select target card | Origin$ Graveyard | Destination$ Library | LibraryPosition$ -1 | SpellDescription$ Put target card from a graveyard on the bottom of its owner's library.
+A:AB$ ChangeZone | Cost$ T | ValidTgts$ Card | TgtPrompt$ Select target card | Origin$ Graveyard | Destination$ Library | LibraryPosition$ -1 | SpellDescription$ Put target card from a graveyard on the bottom of its owner's library.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/junktroller.jpg
 SetInfo:RAV|Uncommon|http://magiccards.info/scans/en/rav/264.jpg
diff --git a/res/cardsfolder/keeper_of_the_nine_gales.txt b/res/cardsfolder/keeper_of_the_nine_gales.txt
index 56b548fd97e..215e2185284 100644
--- a/res/cardsfolder/keeper_of_the_nine_gales.txt
+++ b/res/cardsfolder/keeper_of_the_nine_gales.txt
@@ -4,7 +4,7 @@ Types:Creature Bird Wizard
 Text:no text
 PT:1/2
 K:Flying
-A:AB$ChangeZone | Cost$ T tapXType<2/Bird> | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target permanent to its owner's hand.
+A:AB$ ChangeZone | Cost$ T tapXType<2/Bird> | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target permanent to its owner's hand.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/keeper_of_the_nine_gales.jpg