diff --git a/projects/mtg/bin/Res/sets/10E/_cards.dat b/projects/mtg/bin/Res/sets/10E/_cards.dat
index 2329a3c8a..d3a9a193e 100644
--- a/projects/mtg/bin/Res/sets/10E/_cards.dat
+++ b/projects/mtg/bin/Res/sets/10E/_cards.dat
@@ -1624,6 +1624,20 @@ type=Sorcery
 mana={3}{G}{G}
 [/card]
 [card]
+text=First strike (This creature deals combat damage before creatures without first strike.)  When Nekrataal comes into play, destroy target nonartifact, nonblack creature. That creature can't be regenerated.
+id=129658
+name=Nekrataal
+target=creature[-black,-artifact]
+auto=bury
+color=Black
+type=Creature
+mana={2}{B}{B}
+power=2
+subtype=Human Assassin
+toughness=1
+rarity=U
+[/card]
+[card]
 text=Flying (This creature can't be blocked except by creatures with flying or reach.)  Nightmare's power and toughness are each equal to the number of Swamps you control.
 abilities=flying
 id=129659
diff --git a/projects/mtg/bin/Res/sets/10E/todo.dat b/projects/mtg/bin/Res/sets/10E/todo.dat
index 5c8505be1..0a3e9d050 100644
--- a/projects/mtg/bin/Res/sets/10E/todo.dat
+++ b/projects/mtg/bin/Res/sets/10E/todo.dat
@@ -647,18 +647,7 @@ color=Black
 type=Enchantment
 mana={2}{B}{B}
 [/card]
-[card]
-text=First strike (This creature deals combat damage before creatures without first strike.)  When Nekrataal comes into play, destroy target nonartifact, nonblack creature. That creature can't be regenerated.
-id=129658
-name=Nekrataal
-rarity=U
-color=Black
-type=Creature
-mana={2}{B}{B}
-power=2
-subtype=Human Assassin
-toughness=1
-[/card]
+
 [card]
 text=Sacrifice No Rest for the Wicked: Return to your hand all creature cards that were put into your graveyard from play this turn.
 id=136283
diff --git a/projects/mtg/bin/Res/sets/ALA/_cards.dat b/projects/mtg/bin/Res/sets/ALA/_cards.dat
index 268fea63f..61b840983 100644
--- a/projects/mtg/bin/Res/sets/ALA/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ALA/_cards.dat
@@ -1272,6 +1272,21 @@ subtype=Bird Soldier
 toughness=4
 [/card]
 [card]
+text=Flying. When Welkin Guide comes into play, target creature gets +2/+2 and gains flying until end of turn.
+id=178096
+target=creature
+auto=2/2 ueot
+auto=flying ueot
+name=Welkin Guide
+rarity=C
+type=Creature
+mana={4}{W}
+power=2
+subtype=Bird Cleric
+toughness=2
+abilities=flying
+[/card]
+[card]
 text=Wild Nacatl gets +1/+1 as long as you control a Mountain.     Wild Nacatl gets +1/+1 as long as you control a Plains.
 auto=aslongas(mountain|myinplay) 1/1
 auto=aslongas(plains|myinplay) 1/1
diff --git a/projects/mtg/bin/Res/sets/ALA/todo.dat b/projects/mtg/bin/Res/sets/ALA/todo.dat
index 538b3c012..73abd504e 100644
--- a/projects/mtg/bin/Res/sets/ALA/todo.dat
+++ b/projects/mtg/bin/Res/sets/ALA/todo.dat
@@ -1295,17 +1295,7 @@ rarity=C
 type=Sorcery
 mana={4}{R}
 [/card]
-[card]
-text=Flying     When Welkin Guide comes into play, target creature gets +2/+2 and gains flying until end of turn.
-id=178096
-name=Welkin Guide
-rarity=C
-type=Creature
-mana={4}{W}
-power=2
-subtype=Bird Cleric
-toughness=2
-[/card]
+
 [card]
 text=Whenever a creature with power 5 or greater comes into play under your control, you may have Where Ancients Tread deal 5 damage to target creature or player.
 id=175115
diff --git a/projects/mtg/bin/Res/sets/ARB/_cards.dat b/projects/mtg/bin/Res/sets/ARB/_cards.dat
index 238a5eeb5..f67f8eb18 100644
--- a/projects/mtg/bin/Res/sets/ARB/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ARB/_cards.dat
@@ -250,6 +250,19 @@ text=Remove target creature card in a graveyard from the game, then put X 1/1 gr
 rarity=U
 [/card]
 [card]
+id=179580
+name=Nulltread Gargantuan
+mana={1}{G}{U}
+type=Creature
+subtype=Beast
+text=When Nulltread Gargantuan comes into play, put a creature you control on top of its owner's library.
+target=creature|myinplay
+auto=moveTo(ownerlibrary)
+power=5
+toughness=6
+rarity=U
+[/card]
+[card]
 text=Exalted (Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.) {1}, Sacrifice Qasali Pridemage: Destroy target artifact or enchantment.
 id=179556
 name=Qasali Pridemage
diff --git a/projects/mtg/bin/Res/sets/ARB/todo.dat b/projects/mtg/bin/Res/sets/ARB/todo.dat
index 0dc092bab..e0af633f8 100644
--- a/projects/mtg/bin/Res/sets/ARB/todo.dat
+++ b/projects/mtg/bin/Res/sets/ARB/todo.dat
@@ -707,17 +707,7 @@ toughness=7
 text=Whenever Nemesis of Reason attacks, defending player puts the top ten cards of his or her library into his or her graveyard.
 rarity=R
 [/card]
-[card]
-id=179580
-name=Nulltread Gargantuan
-mana={1}{G}{U}
-type=Creature
-subtype=Beast
-power=5
-toughness=6
-text=When Nulltread Gargantuan comes into play, put a creature you control on top of its owner's library.
-rarity=U
-[/card]
+
 [card]
 id=183007
 name=Offering to Asha
diff --git a/projects/mtg/bin/Res/sets/CHK/_cards.dat b/projects/mtg/bin/Res/sets/CHK/_cards.dat
index 20e3c2b45..2a9538445 100644
--- a/projects/mtg/bin/Res/sets/CHK/_cards.dat
+++ b/projects/mtg/bin/Res/sets/CHK/_cards.dat
@@ -1065,3 +1065,17 @@ power=1
 subtype=Spirit
 toughness=1
 [/card]
+[card]
+id=80274
+name=Zo-Zu the Punisher
+mana={1}{R}{R}
+type=Legendary Creature
+subtype=Goblin Warrior
+power=2
+toughness=2
+text=Whenever a land comes into play, Zo-Zu the Punisher deals 2 damage to that land's controller.
+auto=@movedTo(land|myinplay):damage:2 controller
+auto=@movedTo(land|opponentinplay):damage:2 opponent
+abilities=legendary
+rarity=R
+[/card]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/sets/CHK/todo.dat b/projects/mtg/bin/Res/sets/CHK/todo.dat
index c59f3b33a..5a5f1370a 100644
--- a/projects/mtg/bin/Res/sets/CHK/todo.dat
+++ b/projects/mtg/bin/Res/sets/CHK/todo.dat
@@ -2185,15 +2185,4 @@ power=5
 toughness=5
 text=Flying When Yosei, the Morning Star is put into a graveyard from play, target player skips his or her next untap step. Tap up to five target permanents that player controls.
 rarity=R
-[/card]
-[card]
-id=80274
-name=Zo-Zu the Punisher
-mana={1}{R}{R}
-type=Legendary Creature
-subtype=Goblin Warrior
-power=2
-toughness=2
-text=Whenever a land comes into play, Zo-Zu the Punisher deals 2 damage to that land's controller.
-rarity=R
-[/card]
+[/card]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/sets/DIS/_cards.dat b/projects/mtg/bin/Res/sets/DIS/_cards.dat
index 22fdade08..63afb16bf 100644
--- a/projects/mtg/bin/Res/sets/DIS/_cards.dat
+++ b/projects/mtg/bin/Res/sets/DIS/_cards.dat
@@ -58,6 +58,19 @@ auto={T}{S}:destroy target(aura)
 rarity=C
 [/card]
 [card]
+id=107377
+name=Indrik Stomphowler
+target=artifact,enchantment
+mana={4}{G}
+type=Creature
+subtype=Beast
+power=4
+toughness=4
+text=When Indrik Stomphowler enters the battlefield, destroy target artifact or enchantment.
+auto=destroy
+rarity=U
+[/card]
+[card]
 id=107260
 name=Mistral Charger
 mana={1}{W}
@@ -288,6 +301,19 @@ auto={1}{W}:lord(creature|mybattlefield) -defender
 rarity=R
 [/card]
 [card]
+id=97075
+name=Whiptail Moloch
+mana={4}{R}
+type=Creature
+subtype=Lizard
+power=6
+toughness=3
+text=When Whiptail Moloch enters the battlefield, it deals 3 damage to target creature you control.
+target=creature|myinplay
+auto=damage:3
+rarity=C
+[/card]
+[card]
 id=111202
 name=Wrecking Ball
 mana={2}{B}{R}
diff --git a/projects/mtg/bin/Res/sets/DIS/todo.dat b/projects/mtg/bin/Res/sets/DIS/todo.dat
index 7e5e8f021..fde6d826f 100644
--- a/projects/mtg/bin/Res/sets/DIS/todo.dat
+++ b/projects/mtg/bin/Res/sets/DIS/todo.dat
@@ -635,17 +635,7 @@ type=Instant
 text=Exile all cards from your hand face down. At the beginning of the next end step, return those cards to your hand, then draw a card.
 rarity=U
 [/card]
-[card]
-id=107377
-name=Indrik Stomphowler
-mana={4}{G}
-type=Creature
-subtype=Beast
-power=4
-toughness=4
-text=When Indrik Stomphowler enters the battlefield, destroy target artifact or enchantment.
-rarity=U
-[/card]
+
 [card]
 id=107308
 name=Infernal Tutor
@@ -1539,17 +1529,7 @@ type=Instant
 text=Weight of Spires deals damage to target creature equal to the number of nonbasic lands that creature's controller controls.
 rarity=U
 [/card]
-[card]
-id=97075
-name=Whiptail Moloch
-mana={4}{R}
-type=Creature
-subtype=Lizard
-power=6
-toughness=3
-text=When Whiptail Moloch enters the battlefield, it deals 3 damage to target creature you control.
-rarity=C
-[/card]
+
 [card]
 id=97094
 name=Windreaver
diff --git a/projects/mtg/bin/Res/sets/EXO/_cards.dat b/projects/mtg/bin/Res/sets/EXO/_cards.dat
index 61e67004c..dd0547ec0 100644
--- a/projects/mtg/bin/Res/sets/EXO/_cards.dat
+++ b/projects/mtg/bin/Res/sets/EXO/_cards.dat
@@ -546,8 +546,8 @@ id=6121
 name=Spellshock
 mana={2}{R}
 type=Enchantment
-auto=@movedTo(*[-land]|mystack):damage:2 controller
-auto=@movedTo(*[-land]|opponentstack):damage:2 opponent
+auto=@movedTo(*|mystack):damage:2 controller
+auto=@movedTo(*|opponentstack):damage:2 opponent
 text=Whenever a player plays a spell, Spellshock deals 2 damage to that player.
 rarity=U
 [/card]
@@ -675,4 +675,17 @@ subtype=Frog
 auto={U}:flying
 power=1
 toughness=3
+[/card]
+[card]
+text=When Wood Elves comes into play, search your library for a Forest card and put that card into play. Then shuffle your library.
+target=forest|myLibrary
+auto=moveTo(mybattlefield) 
+id=6135
+name=Wood Elves
+rarity=C
+mana={2}{G}
+type=Creature
+subtype=Elf Scout
+power=1
+toughness=1
 [/card]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/sets/EXO/todo.dat b/projects/mtg/bin/Res/sets/EXO/todo.dat
index bd3ce77b1..7396aafd6 100644
--- a/projects/mtg/bin/Res/sets/EXO/todo.dat
+++ b/projects/mtg/bin/Res/sets/EXO/todo.dat
@@ -752,18 +752,7 @@ toughness=7
 text=Defender (This creature can't attack.) At end of combat, remove from the game all creatures blocked by Wall of Nets. When Wall of Nets leaves play, return to play under their owners' control all creatures removed from the game with Wall of Nets.
 rarity=R
 [/card]
-[card]
-text=When Wood Elves comes into play, search your library for a Forest card and put that card into play. Then shuffle your library.
-auto=moveTo(mybattlefield) target(forest|myLibrary)
-id=6135
-name=Wood Elves
-rarity=C
-mana={2}{G}
-type=Creature
-subtype=Elf Scout
-power=1
-toughness=1
-[/card]
+
 [card]
 id=6156
 name=Workhorse
diff --git a/projects/mtg/bin/Res/sets/GPT/_cards.dat b/projects/mtg/bin/Res/sets/GPT/_cards.dat
index 789e5d756..1e451f070 100644
--- a/projects/mtg/bin/Res/sets/GPT/_cards.dat
+++ b/projects/mtg/bin/Res/sets/GPT/_cards.dat
@@ -221,6 +221,19 @@ type=Enchantment
 mana={1}{U}
 [/card]
 [card]
+id=97202
+name=Izzet Chronarch
+mana={3}{U}{R}
+type=Creature
+subtype=Human Wizard
+power=2
+toughness=2
+text=When Izzet Chronarch enters the battlefield, return target instant or sorcery card from your graveyard to your hand.
+target=instant,sorcery
+auto=moveTo(myhand)
+rarity=C
+[/card]
+[card]
 text={1}, {T}: Add {U}{R} to your mana pool.
 auto={1}{T}:Add {U}{R}
 id=96867
@@ -431,7 +444,7 @@ mana={3}{B}{B}
 type=Creature
 subtype=Vampire Skeleton
 auto=token(Bat,creature bat, 1/1,flying bat)*2
-auto={4}{B}{B}{S(bat|myBattlefield)}:token(Bat,creature bat,1/1,flying,black) && token(Bat,creature bat,1/1,flying,black)
+auto={3}{B}{B}{S(bat|myBattlefield)}:token(Bat,creature bat,1/1,flying,black) && token(Bat,creature bat,1/1,flying,black)
 auto={S(bat|myBattlefield)}:regenerate
 power=3
 toughness=3
diff --git a/projects/mtg/bin/Res/sets/GPT/todo.dat b/projects/mtg/bin/Res/sets/GPT/todo.dat
index 263342fad..fe9fa4b2b 100644
--- a/projects/mtg/bin/Res/sets/GPT/todo.dat
+++ b/projects/mtg/bin/Res/sets/GPT/todo.dat
@@ -42,17 +42,7 @@ toughness=3
 text=At the beginning of your upkeep, each opponent loses 1 life. You gain life equal to the life lost this way.
 rarity=U
 [/card]
-[card]
-id=83869
-name=Angel of Despair
-mana={3}{W}{W}{B}{B}
-type=Creature
-subtype=Angel
-power=5
-toughness=5
-text=Flying When Angel of Despair enters the battlefield, destroy target permanent.
-rarity=R
-[/card]
+
 [card]
 id=96964
 name=Battering Wurm
@@ -664,17 +654,7 @@ type=Land
 text=Izzet Boilerworks enters the battlefield tapped. When Izzet Boilerworks enters the battlefield, return a land you control to its owner's hand. {T}: Add {U}{R} to your mana pool.
 rarity=C
 [/card]
-[card]
-id=97202
-name=Izzet Chronarch
-mana={3}{U}{R}
-type=Creature
-subtype=Human Wizard
-power=2
-toughness=2
-text=When Izzet Chronarch enters the battlefield, return target instant or sorcery card from your graveyard to your hand.
-rarity=C
-[/card]
+
 [card]
 id=96966
 name=Izzet Guildmage
@@ -994,17 +974,7 @@ toughness=1
 text={B}, Sacrifice a creature: Target creature gets -1/-1 until end of turn.
 rarity=U
 [/card]
-[card]
-id=107099
-name=Poisonbelly Ogre
-mana={4}{B}
-type=Creature
-subtype=Ogre Warrior
-power=3
-toughness=3
-text=Whenever another creature enters the battlefield, its controller loses 1 life.
-rarity=C
-[/card]
+
 [card]
 id=96931
 name=Predatory Focus
@@ -1262,17 +1232,7 @@ toughness=3
 text=Bloodthirst 3 (If an opponent was dealt damage this turn, this creature enters the battlefield with three +1/+1 counters on it.) {1}, Sacrifice Skarrgan Skybreaker: Skarrgan Skybreaker deals damage equal to its power to target creature or player.
 rarity=U
 [/card]
-[card]
-id=96899
-name=Skeletal Vampire
-mana={4}{B}{B}
-type=Creature
-subtype=Vampire Skeleton
-power=3
-toughness=3
-text=Flying When Skeletal Vampire enters the battlefield, put two 1/1 black Bat creature tokens with flying onto the battlefield. {3}{B}{B}, Sacrifice a Bat: Put two 1/1 black Bat creature tokens with flying onto the battlefield. Sacrifice a Bat: Regenerate Skeletal Vampire.
-rarity=R
-[/card]
+
 [card]
 id=96835
 name=Sky Swallower
diff --git a/projects/mtg/bin/Res/sets/INV/_cards.dat b/projects/mtg/bin/Res/sets/INV/_cards.dat
index 174e18917..53e7571f1 100644
--- a/projects/mtg/bin/Res/sets/INV/_cards.dat
+++ b/projects/mtg/bin/Res/sets/INV/_cards.dat
@@ -1060,6 +1060,19 @@ mana={1}{W}
 subtype=Aura
 [/card]
 [card]
+text=When Quirion Trailblazer comes into play, you may search your library for a basic land card and put that card into play tapped. If you do, shuffle your library.
+id=23110
+target=land[basic]
+auto=moveTo(myinplay) && tap
+name=Quirion Trailblazer
+rarity=C
+type=Creature
+mana={3}{G}
+power=1
+subtype=Elf Scout
+toughness=2
+[/card]
+[card]
 text={2}: Target black or green creature gains haste until end of turn. (It can attack and {T} this turn.)
 id=23081
 name=Rage Weaver
@@ -1756,4 +1769,4 @@ name=Zap
 rarity=C
 mana={2}{R}
 type=Instant
-[/card]
+[/card]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/sets/INV/todo.dat b/projects/mtg/bin/Res/sets/INV/todo.dat
index f94d539f6..98922cc5b 100644
--- a/projects/mtg/bin/Res/sets/INV/todo.dat
+++ b/projects/mtg/bin/Res/sets/INV/todo.dat
@@ -1053,17 +1053,7 @@ power=2
 subtype=Elf Druid
 toughness=1
 [/card]
-[card]
-text=When Quirion Trailblazer comes into play, you may search your library for a basic land card and put that card into play tapped. If you do, shuffle your library.
-id=23110
-name=Quirion Trailblazer
-rarity=C
-type=Creature
-mana={3}{G}
-power=1
-subtype=Elf Scout
-toughness=2
-[/card]
+
 
 
 [card]
diff --git a/projects/mtg/bin/Res/sets/LRW/_cards.dat b/projects/mtg/bin/Res/sets/LRW/_cards.dat
index 823033007..1994cfc24 100644
--- a/projects/mtg/bin/Res/sets/LRW/_cards.dat
+++ b/projects/mtg/bin/Res/sets/LRW/_cards.dat
@@ -522,6 +522,19 @@ type=Basic Land
 subtype=Island
 [/card]
 [card]
+text=When Kinsbaile Skirmisher enters the battlefield, target creature gets +1/+1 until end of turn.
+target=creature
+auto=1/1 ueot
+id=143018
+name=Kinsbaile Skirmisher
+rarity=C
+type=Creature
+mana={1}{W}
+power=2
+subtype=Kithkin Soldier
+toughness=2
+[/card]
+[card]
 text={G}, {T}: Target attacking creature gets +2/+2 until end of turn.
 auto={G}{T}:2/2 target(creature[attacking])
 id=139498
@@ -933,6 +946,19 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+text=When Spiderwig Boggart enters the battlefield, target creature gains fear until end of turn.
+target=creature
+auto=fear ueot
+id=146445
+name=Spiderwig Boggart
+rarity=C
+type=Creature
+mana={2}{B}
+power=2
+subtype=Goblin Shaman
+toughness=2
+[/card]
+[card]
 text={T}, Tap an untapped creature you control: Add one mana of any color to your mana pool.
 auto={T}:tap target(creature[-tapped]|myBattlefield) && Add{B}
 auto={T}:tap target(creature[-tapped]|myBattlefield) && Add{U}
diff --git a/projects/mtg/bin/Res/sets/LRW/todo.dat b/projects/mtg/bin/Res/sets/LRW/todo.dat
index b325a5899..7ba31a140 100644
--- a/projects/mtg/bin/Res/sets/LRW/todo.dat
+++ b/projects/mtg/bin/Res/sets/LRW/todo.dat
@@ -1050,19 +1050,7 @@ power=2
 subtype=Kithkin Cleric
 toughness=2
 [/card]
-[card]
-###THIS CARD IS NOT ABLE TO GIVE +1/+1 TO ITSELF WHEN ENTERING THE BATTLEFIELD FOR NOW! (WAGIC 0.8.1)
-text=When Kinsbaile Skirmisher enters the battlefield, target creature gets +1/+1 until end of turn.
-auto=1/1 target(creature)
-id=143018
-name=Kinsbaile Skirmisher
-rarity=C
-type=Creature
-mana={1}{W}
-power=2
-subtype=Kithkin Soldier
-toughness=2
-[/card]
+
 [card]
 text=Target creature gains deathtouch until end of turn. (Whenever it deals damage to a creature, destroy that creature.)  Draw a card.
 id=143376
@@ -1609,19 +1597,7 @@ power=1
 subtype=Faerie Wizard
 toughness=1
 [/card]
-[card]
-###SEE KITHKIN SKIRMISHER!!!
-text=When Spiderwig Boggart enters the battlefield, target creature gains fear until end of turn.
-auto=fear target(creature)
-id=146445
-name=Spiderwig Boggart
-rarity=C
-type=Creature
-mana={2}{B}
-power=2
-subtype=Goblin Shaman
-toughness=2
-[/card]
+
 [card]
 text=Hideaway (This land comes into play tapped. When it does, look at the top four cards of your library, remove one from the game face down, then put the rest on the bottom of your library.)  {T}: Add {R} to your mana pool.     {R}, {T}: You may play the removed card without paying its mana cost if an opponent was dealt 7 or more damage this turn.
 id=139514
diff --git a/projects/mtg/bin/Res/sets/M10/_cards.dat b/projects/mtg/bin/Res/sets/M10/_cards.dat
index 2a3577474..27adcc41f 100644
--- a/projects/mtg/bin/Res/sets/M10/_cards.dat
+++ b/projects/mtg/bin/Res/sets/M10/_cards.dat
@@ -1577,6 +1577,19 @@ auto=life:4
 rarity=C
 [/card]
 [card]
+id=191053
+name=Sparkmage Apprentice
+target=creature,player
+mana={1}{R}
+type=Creature
+subtype=Human Wizard
+power=1
+toughness=1
+text=When Sparkmage Apprentice enters the battlefield, it deals 1 damage to target creature or player.
+auto=damage:1
+rarity=C
+[/card]
+[card]
 id=189899
 name=Stampeding Rhino
 mana={4}{G}
diff --git a/projects/mtg/bin/Res/sets/M10/todo.dat b/projects/mtg/bin/Res/sets/M10/todo.dat
index 704c670b9..afcc61bc4 100644
--- a/projects/mtg/bin/Res/sets/M10/todo.dat
+++ b/projects/mtg/bin/Res/sets/M10/todo.dat
@@ -551,17 +551,7 @@ target=creature
 auto=@each ??? upkeep:life:-1 targetController
 rarity=C
 [/card]
-[card]
-id=191053
-name=Sparkmage Apprentice
-mana={1}{R}
-type=Creature
-subtype=Human Wizard
-power=1
-toughness=1
-text=When Sparkmage Apprentice enters the battlefield, it deals 1 damage to target creature or player.
-rarity=C
-[/card]
+
 [card]
 id=191338
 name=Spellbook
diff --git a/projects/mtg/bin/Res/sets/MOR/_cards.dat b/projects/mtg/bin/Res/sets/MOR/_cards.dat
index 998b59393..edd8dd8ce 100644
--- a/projects/mtg/bin/Res/sets/MOR/_cards.dat
+++ b/projects/mtg/bin/Res/sets/MOR/_cards.dat
@@ -161,6 +161,19 @@ power=2
 toughness=2
 [/card]
 [card]
+id=152699
+name=Merrow Witsniper
+target=player
+mana={U}
+type=Creature
+subtype=Merfolk Rogue
+power=1
+toughness=1
+text=When Merrow Witsniper enters the battlefield, target player puts the top card of his or her library into his or her graveyard.
+auto=deplete:1
+rarity=C
+[/card]
+[card]
 text=Target player discards X cards at random.
 id=157422
 name=Mind Shatter
diff --git a/projects/mtg/bin/Res/sets/MOR/todo.dat b/projects/mtg/bin/Res/sets/MOR/todo.dat
index e0710c45d..763542f16 100644
--- a/projects/mtg/bin/Res/sets/MOR/todo.dat
+++ b/projects/mtg/bin/Res/sets/MOR/todo.dat
@@ -689,17 +689,7 @@ toughness=3
 text=When Meadowboon leaves the battlefield, put a +1/+1 counter on each creature target player controls. Evoke {3}{W} (You may cast this spell for its evoke cost. If you do, it's sacrificed when it enters the battlefield.)
 rarity=U
 [/card]
-[card]
-id=152699
-name=Merrow Witsniper
-mana={U}
-type=Creature
-subtype=Merfolk Rogue
-power=1
-toughness=1
-text=When Merrow Witsniper enters the battlefield, target player puts the top card of his or her library into his or her graveyard.
-rarity=C
-[/card]
+
 [card]
 id=157422
 name=Mind Shatter
diff --git a/projects/mtg/bin/Res/sets/MRD/_cards.dat b/projects/mtg/bin/Res/sets/MRD/_cards.dat
index 7ab4d1a6c..33d0f2d10 100644
--- a/projects/mtg/bin/Res/sets/MRD/_cards.dat
+++ b/projects/mtg/bin/Res/sets/MRD/_cards.dat
@@ -1046,6 +1046,20 @@ power=1
 toughness=3
 [/card]
 [card]
+id=49434
+name=Solemn Simulacrum
+rarity=R
+type=Artifact Creature
+mana={4}
+text=When Solemn Simulacrum comes into play, you may search your library for a basic land card and put that card into play tapped. If you do, shuffle your library.     When Solemn Simulacrum is put into a graveyard from play, you may draw a card.
+target=land[basic]|mylibrary
+auto=moveTo(myinplay) && tap
+auto=@movedTo(this|graveyard) from(inplay):may draw:1
+power=2
+subtype=Golem
+toughness=2
+[/card]
+[card]
 text=Defender (This creature can't attack.)
 id=48910
 name=Steel Wall
diff --git a/projects/mtg/bin/Res/sets/MRD/todo.dat b/projects/mtg/bin/Res/sets/MRD/todo.dat
index 01ac62080..67e8f69c5 100644
--- a/projects/mtg/bin/Res/sets/MRD/todo.dat
+++ b/projects/mtg/bin/Res/sets/MRD/todo.dat
@@ -1309,17 +1309,7 @@ type=Sorcery
 mana={4}{W}{W}
 [/card]
 
-[card]
-text=When Solemn Simulacrum comes into play, you may search your library for a basic land card and put that card into play tapped. If you do, shuffle your library.     When Solemn Simulacrum is put into a graveyard from play, you may draw a card.
-id=49434
-name=Solemn Simulacrum
-rarity=R
-type=Artifact Creature
-mana={4}
-power=2
-subtype=Golem
-toughness=2
-[/card]
+
 [card]
 text=Affinity for artifacts (This spell costs {1} less to play for each artifact you control.)  Flying
 id=45973
diff --git a/projects/mtg/bin/Res/sets/ODY/_cards.dat b/projects/mtg/bin/Res/sets/ODY/_cards.dat
index c501f1995..f7a7f0bab 100644
--- a/projects/mtg/bin/Res/sets/ODY/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ODY/_cards.dat
@@ -113,7 +113,7 @@ toughness=2
 [/card]
 [card]
 text=Flying (This creature can't be blocked except by creatures with flying or reach.)  When Aven Fisher is put into a graveyard from play, you may draw a card.
-auto=@movedTo(this|graveyard):may draw:1
+auto=@movedTo(this|graveyard) from(inplay):may draw:1
 id=31815
 name=Aven Fisher
 rarity=C
diff --git a/projects/mtg/bin/Res/sets/ONS/_cards.dat b/projects/mtg/bin/Res/sets/ONS/_cards.dat
index ce4c5f685..8e01a4d96 100644
--- a/projects/mtg/bin/Res/sets/ONS/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ONS/_cards.dat
@@ -248,6 +248,19 @@ toughness=2
 rarity=C
 [/card]
 [card]
+id=12463
+name=Elvish Pioneer
+mana={G}
+type=Creature
+subtype=Elf Druid
+power=1
+toughness=1
+text=When Elvish Pioneer comes into play, you may put a basic land card from your hand into play tapped.
+target=land[basic]|myhand
+auto=moveTo(myinplay) && tap
+rarity=C
+[/card]
+[card]
 text={G}, {T}, Sacrifice Elvish Scrapper: Destroy target artifact.
 id=13778
 name=Elvish Scrapper
@@ -1028,6 +1041,18 @@ auto=foreach(elf) 1/1
 rarity=C
 [/card]
 [card]
+id=39703
+name=Wirewood Savage
+mana={2}{G}
+type=Creature
+subtype=Elf
+power=2
+toughness=2
+text=Whenever a Beast comes into play, you may draw a card.
+auto=@movedTo(beast|inplay):may draw:1
+rarity=C
+[/card]
+[card]
 id=39506
 name=Wooded Foothills
 mana=
@@ -1036,7 +1061,6 @@ text={T}, Pay 1 life, Sacrifice Wooded Foothills: Search your library for a Moun
 auto={T}{S}:moveTo(myBattlefield) target(mountain,forest|mylibrary) && life:-1 controller
 rarity=R
 [/card]
-text=Whenever another creature enters the battlefield, you lose 1 life.
 [card]
 id=26689
 name=Wretched Anurid
@@ -1045,6 +1069,7 @@ type=Creature
 subtype=Zombie Frog Beast
 power=3
 toughness=3
+text=Whenever another creature enters the battlefield, you lose 1 life.
 auto=@movedTo(creature|battlefield): life:-1 controller
 rarity=C
 [/card]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/sets/ONS/todo.dat b/projects/mtg/bin/Res/sets/ONS/todo.dat
index ede290570..9a821f32a 100644
--- a/projects/mtg/bin/Res/sets/ONS/todo.dat
+++ b/projects/mtg/bin/Res/sets/ONS/todo.dat
@@ -751,17 +751,7 @@ subtype=Aura
 text=Enchant land. Whenever enchanted land is tapped for mana, its controller adds {G} to his or her mana pool for each Elf in play (in addition to the mana the land produces).
 rarity=C
 [/card]
-[card]
-id=12463
-name=Elvish Pioneer
-mana={G}
-type=Creature
-subtype=Elf Druid
-power=1
-toughness=1
-text=When Elvish Pioneer comes into play, you may put a basic land card from your hand into play tapped.
-rarity=C
-[/card]
+
 
 [card]
 id=35514
@@ -2377,17 +2367,7 @@ toughness=1
 text=When Wirewood Herald is put into a graveyard from play, you may search your library for an Elf card, reveal that card, put it into your hand, then shuffle your library.
 rarity=C
 [/card]
-[card]
-id=39703
-name=Wirewood Savage
-mana={2}{G}
-type=Creature
-subtype=Elf
-power=2
-toughness=2
-text=Whenever a Beast comes into play, you may draw a card.
-rarity=C
-[/card]
+
 [card]
 id=41150
 name=Withering Hex
diff --git a/projects/mtg/bin/Res/sets/PLC/_cards.dat b/projects/mtg/bin/Res/sets/PLC/_cards.dat
index 88622235d..480efc840 100644
--- a/projects/mtg/bin/Res/sets/PLC/_cards.dat
+++ b/projects/mtg/bin/Res/sets/PLC/_cards.dat
@@ -444,4 +444,18 @@ type=Enchantment
 mana={B}
 color=Black
 subtype=Aura
+[/card]
+[card]
+id=122477
+name=Whitemane Lion
+mana={1}{W}
+type=Creature
+subtype=Cat
+power=2
+toughness=2
+text=Flash (You may cast this spell any time you could cast an instant.) When Whitemane Lion enters the battlefield, return a creature you control to its owner's hand.
+target=creature|myinplay
+auto=moveTo(ownerhand)
+abilities=flash
+rarity=C
 [/card]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/sets/PLC/todo.dat b/projects/mtg/bin/Res/sets/PLC/todo.dat
index c32a45453..288f57acc 100644
--- a/projects/mtg/bin/Res/sets/PLC/todo.dat
+++ b/projects/mtg/bin/Res/sets/PLC/todo.dat
@@ -1320,17 +1320,7 @@ toughness=6
 text=Vanishing 2 (This permanent enters the battlefield with two time counters on it. At the beginning of your upkeep, remove a time counter from it. When the last is removed, sacrifice it.)
 rarity=U
 [/card]
-[card]
-id=122477
-name=Whitemane Lion
-mana={1}{W}
-type=Creature
-subtype=Cat
-power=2
-toughness=2
-text=Flash (You may cast this spell any time you could cast an instant.) When Whitemane Lion enters the battlefield, return a creature you control to its owner's hand.
-rarity=C
-[/card]
+
 [card]
 id=122468
 name=Wild Pair
diff --git a/projects/mtg/bin/Res/sets/POR/_cards.dat b/projects/mtg/bin/Res/sets/POR/_cards.dat
index b9e7f5373..58a9fea38 100644
--- a/projects/mtg/bin/Res/sets/POR/_cards.dat
+++ b/projects/mtg/bin/Res/sets/POR/_cards.dat
@@ -818,6 +818,19 @@ power=4
 toughness=2
 [/card]
 [card]
+text=When Man-o'-War comes into play, return target creature to its owner's hand.
+id=4266
+target=creature
+auto=moveTo(ownerhand)
+name=Man-o'-War
+mana={2}{U}
+rarity=U
+type=Creature
+subtype=Jellyfish
+power=2
+toughness=2
+[/card]
+[card]
 id=4267
 name=Merfolk of the Pearl Trident
 rarity=C
diff --git a/projects/mtg/bin/Res/sets/POR/todo.dat b/projects/mtg/bin/Res/sets/POR/todo.dat
index 7dcdbd225..2b002a32a 100644
--- a/projects/mtg/bin/Res/sets/POR/todo.dat
+++ b/projects/mtg/bin/Res/sets/POR/todo.dat
@@ -241,19 +241,7 @@ rarity=R
 type=Sorcery
 mana={R}{R}
 [/card]
-[card]
-text=When Man-o'-War comes into play, return target creature to its owner's hand.
-alias=1229
-id=4266
-target=creature
-name=Man-o'-War
-mana={2}{U}
-rarity=U
-type=Creature
-subtype=Jellyfish
-power=2
-toughness=2
-[/card]
+
 [card]
 text=When Mercenary Knight comes into play, sacrifice it unless you discard a creature card.
 id=4228
diff --git a/projects/mtg/bin/Res/sets/RAV/_cards.dat b/projects/mtg/bin/Res/sets/RAV/_cards.dat
index 962a2f0bf..e80807aee 100644
--- a/projects/mtg/bin/Res/sets/RAV/_cards.dat
+++ b/projects/mtg/bin/Res/sets/RAV/_cards.dat
@@ -521,6 +521,21 @@ power=1
 toughness=2
 [/card]
 [card]
+text=Flying. When Keening Banshee comes into play, target creature gets -2/-2 until end of turn.
+id=83599
+name=Keening Banshee
+target=creature
+auto=-2/-2 ueot
+rarity=C
+color=Black
+mana={2}{B}{B}
+type=Creature
+subtype=Spirit
+power=2
+toughness=2
+abilities=flying
+[/card]
+[card]
 text=Target creature gets -3/-3 until end of turn.
 id=89056
 target=creature
diff --git a/projects/mtg/bin/Res/sets/RAV/todo.dat b/projects/mtg/bin/Res/sets/RAV/todo.dat
index 50676cec6..97b7032a6 100644
--- a/projects/mtg/bin/Res/sets/RAV/todo.dat
+++ b/projects/mtg/bin/Res/sets/RAV/todo.dat
@@ -991,21 +991,7 @@ power=0
 subtype=Golem
 toughness=6
 [/card]
-[card]
-text=Flying      When Keening Banshee comes into play, target creature gets -2/-2 until end of turn.
-id=83599
-name=Keening Banshee
-target=creature
-auto=-2/-2
-rarity=C
-color=Black
-mana={2}{B}{B}
-type=Creature
-subtype=Spirit
-power=2
-toughness=2
-abilities=flying
-[/card]
+
 [card]
 text=Put a card in your hand on top of your library: Return Leashling to its owner's hand.
 id=89008
diff --git a/projects/mtg/bin/Res/sets/SHM/_cards.dat b/projects/mtg/bin/Res/sets/SHM/_cards.dat
index 404f05417..6737f6aeb 100644
--- a/projects/mtg/bin/Res/sets/SHM/_cards.dat
+++ b/projects/mtg/bin/Res/sets/SHM/_cards.dat
@@ -247,6 +247,19 @@ subtype=Elemental
 toughness=*
 [/card]
 [card]
+text=When Cultbrand Cinder comes into play, put a -1/-1 counter on target creature.
+id=142068
+target=creature
+auto=counter(-1/-1,1)
+name=Cultbrand Cinder
+rarity=C
+type=Creature
+mana={4}{BR}
+power=3
+subtype=Elemental Shaman
+toughness=3
+[/card]
+[card]
 text=Enchant creature     At the beginning of each upkeep, tap enchanted creature.
 id=146079
 target=creature
diff --git a/projects/mtg/bin/Res/sets/SHM/todo.dat b/projects/mtg/bin/Res/sets/SHM/todo.dat
index a96d52631..1f82621d3 100644
--- a/projects/mtg/bin/Res/sets/SHM/todo.dat
+++ b/projects/mtg/bin/Res/sets/SHM/todo.dat
@@ -193,17 +193,7 @@ rarity=C
 type=Instant
 mana={R}
 [/card]
-[card]
-text=When Cultbrand Cinder comes into play, put a -1/-1 counter on target creature.
-id=142068
-name=Cultbrand Cinder
-rarity=C
-type=Creature
-mana={4}{BR}
-power=3
-subtype=Elemental Shaman
-toughness=3
-[/card]
+
 [card]
 text=Sacrifice Cursecatcher: Counter target instant or sorcery spell unless its controller pays {1}.
 id=158763
diff --git a/projects/mtg/bin/Res/sets/STH/_cards.dat b/projects/mtg/bin/Res/sets/STH/_cards.dat
index 666b82a10..64ea6307c 100644
--- a/projects/mtg/bin/Res/sets/STH/_cards.dat
+++ b/projects/mtg/bin/Res/sets/STH/_cards.dat
@@ -545,7 +545,7 @@ type=Enchantment
 [/card]
 [card]
 text=When Venerable Monk enters the battlefield, you gain 2 life.
-auto=life:2
+auto=life:2 controller
 id=5258
 name=Venerable Monk
 color=White
@@ -584,7 +584,7 @@ text=Defender   When Wall of Blossoms enters the battlefield, draw a card.
 id=5265
 auto=draw:1 controller
 name=Wall of Blossoms
-colour=Green
+color=Green
 rarity=U
 mana={1}{G}
 type=Creature
diff --git a/projects/mtg/bin/Res/sets/STH/todo.dat b/projects/mtg/bin/Res/sets/STH/todo.dat
index b64e087b3..d0983dd45 100644
--- a/projects/mtg/bin/Res/sets/STH/todo.dat
+++ b/projects/mtg/bin/Res/sets/STH/todo.dat
@@ -372,17 +372,7 @@ toughness=2
 text={R}: Flowstone Shambler gets +1/-1 until end of turn.
 rarity=C
 [/card]
-[card]
-id=5158
-name=Foul Imp
-mana={B}{B}
-type=Creature
-subtype=Imp
-power=2
-toughness=2
-text=Flying When Foul Imp enters the battlefield, you lose 2 life.
-rarity=U
-[/card]
+
 [card]
 id=5160
 name=Furnace Spirit
@@ -849,17 +839,7 @@ type=Sorcery
 text=Buyback {3} (You may pay an additional {3} as you cast this spell. If you do, put this card into your hand as it resolves.) Target creature gets +3/+0 until end of turn.
 rarity=C
 [/card]
-[card]
-id=5219
-name=Serpent Warrior
-mana={2}{B}
-type=Creature
-subtype=Snake Warrior
-power=3
-toughness=3
-text=When Serpent Warrior enters the battlefield, you lose 3 life.
-rarity=C
-[/card]
+
 [card]
 id=5220
 name=Shaman en-Kor
@@ -1199,17 +1179,7 @@ type=Enchantment
 text={B}, Discard a creature card: Return target creature card from your graveyard to your hand.
 rarity=C
 [/card]
-[card]
-id=5258
-name=Venerable Monk
-mana={2}{W}
-type=Creature
-subtype=Human Monk Cleric
-power=2
-toughness=2
-text=When Venerable Monk enters the battlefield, you gain 2 life.
-rarity=U
-[/card]
+
 [card]
 id=5259
 name=Verdant Touch
@@ -1275,17 +1245,7 @@ toughness=3
 text=Walking Dream is unblockable.  Walking Dream doesn't untap during your untap step if an opponent controls two or more creatures.
 rarity=U
 [/card]
-[card]
-id=5265
-name=Wall of Blossoms
-mana={1}{G}
-type=Creature
-subtype=Plant Wall
-power=0
-toughness=4
-text=Defender (This creature can't attack.) When Wall of Blossoms enters the battlefield, draw a card.
-rarity=U
-[/card]
+
 [card]
 id=5267
 name=Wall of Essence
diff --git a/projects/mtg/bin/Res/sets/USG/_cards.dat b/projects/mtg/bin/Res/sets/USG/_cards.dat
index 353b23480..cdb3ee26b 100644
--- a/projects/mtg/bin/Res/sets/USG/_cards.dat
+++ b/projects/mtg/bin/Res/sets/USG/_cards.dat
@@ -759,6 +759,20 @@ power=2
 toughness=2
 [/card]
 [card]
+text=When Monk Realist comes into play, destroy target enchantment.
+target=enchantment
+auto=destroy
+id=5708
+name=Monk Realist
+color=White
+rarity=C
+mana={1}{W}
+type=Creature
+subtype=Human Monk Cleric
+power=1
+toughness=1
+[/card]
+[card]
 text={U}: Untap Morphling.   {U}: Morphling gains flying until end of turn.   {U}: Morphling gains shroud until end of turn. (It can't be the target of spells or abilities.)   {1}: Morphling gets +1/-1 until end of turn.   {1}: Morphling gets -1/+1 until end of turn.
 id=5863
 name=Morphling
diff --git a/projects/mtg/bin/Res/sets/USG/todo.dat b/projects/mtg/bin/Res/sets/USG/todo.dat
index b40c4cd23..f04153f12 100644
--- a/projects/mtg/bin/Res/sets/USG/todo.dat
+++ b/projects/mtg/bin/Res/sets/USG/todo.dat
@@ -961,19 +961,7 @@ type=Artifact
 mana={5}
 [/card]
 
-[card]
-text=When Monk Realist comes into play, destroy target enchantment.
-auto=may destroy target(enchantment)
-id=5708
-name=Monk Realist
-color=White
-rarity=C
-mana={1}{W}
-type=Creature
-subtype=Human Monk Cleric
-power=1
-toughness=1
-[/card]
+
 [card]
 text=Sacrifice No Rest for the Wicked: Return to your hand all creature cards that were put into your graveyard from play this turn.
 id=8802