diff --git a/projects/mtg/bin/Res/sets/10E/_cards.dat b/projects/mtg/bin/Res/sets/10E/_cards.dat
index 15f66188d..0cb1022d1 100644
--- a/projects/mtg/bin/Res/sets/10E/_cards.dat
+++ b/projects/mtg/bin/Res/sets/10E/_cards.dat
@@ -172,20 +172,6 @@ type=Sorcery
 mana={2}{B}
 [/card]
 [card]
-text=Flying (This creature can't be blocked except by creatures with flying or reach.)   When Aven Cloudchaser comes into play, destroy target enchantment.
-id=129470
-name=Aven Cloudchaser
-target=enchantment
-auto=destroy
-rarity=C
-color=White
-type=Creature
-mana={3}{W}
-power=2
-subtype=Bird Soldier
-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.
 abilities=flying
 auto=@movedTo(this|graveyard):draw:1
@@ -1624,21 +1610,6 @@ 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
-abilities=first strike
-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
@@ -2983,18 +2954,4 @@ mana={1}{W}
 power=2
 subtype=Human Knight
 toughness=1
-[/card]
-[card]
-text=When Viridian Shaman comes into play, destroy target artifact.
-id=129792
-name=Viridian Shaman
-target=artifact
-auto=destroy
-rarity=U
-color=Green
-type=Creature
-mana={2}{G}
-power=2
-subtype=Elf Shaman
-toughness=2
 [/card]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/sets/10E/todo.dat b/projects/mtg/bin/Res/sets/10E/todo.dat
index 0a3e9d050..de8ef7a88 100644
--- a/projects/mtg/bin/Res/sets/10E/todo.dat
+++ b/projects/mtg/bin/Res/sets/10E/todo.dat
@@ -68,7 +68,21 @@ power=8
 subtype=Avatar
 toughness=8
 [/card]
-
+[card]
+text=Flying (This creature can't be blocked except by creatures with flying or reach.)   When Aven Cloudchaser comes into play, destroy target enchantment.
+#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
+id=129470
+name=Aven Cloudchaser
+target=enchantment
+auto=destroy
+rarity=C
+color=White
+type=Creature
+mana={3}{W}
+power=2
+subtype=Bird Soldier
+toughness=2
+[/card]
 [card]
 text=Flying (This creature can't be blocked except by creatures with flying or reach.)  {1}{U}: Target player reveals the top card of his or her library.
 id=129473
@@ -647,7 +661,22 @@ 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.
+#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
+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
+abilities=first strike
+rarity=U
+[/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
@@ -1125,7 +1154,21 @@ power=3
 subtype=Viashino
 toughness=2
 [/card]
-
+[card]
+text=When Viridian Shaman comes into play, destroy target artifact.
+id=129792
+name=Viridian Shaman
+target=artifact
+#abilities "when...enters the battlefield ... target..." are not supported unless there is a "may"
+auto=destroy
+rarity=U
+color=Green
+type=Creature
+mana={2}{G}
+power=2
+subtype=Elf Shaman
+toughness=2
+[/card]
 [card]
 text=Flying (This creature can't be blocked except by creatures with flying or reach.)  As Voice of All comes into play, choose a color.      Voice of All has protection from the chosen color. (It can't be blocked, targeted, dealt damage, or enchanted by anything of the chosen color.)
 id=136290
diff --git a/projects/mtg/bin/Res/sets/ALA/_cards.dat b/projects/mtg/bin/Res/sets/ALA/_cards.dat
index 61b840983..b180c9510 100644
--- a/projects/mtg/bin/Res/sets/ALA/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ALA/_cards.dat
@@ -78,19 +78,7 @@ rarity=C
 type=Sorcery
 mana={1}{B}{R}
 [/card]
-[card]
-text=When Blister Beetle comes into play, target creature gets -1/-1 until end of turn.
-target=creature
-auto=-1/-1 ueot
-id=174893
-name=Blister Beetle
-rarity=C
-type=Creature
-mana={1}{B}
-power=1
-subtype=Insect
-toughness=1
-[/card]
+
 [card]
 text=Flying     When Broodmate Dragon comes into play, put a 4/4 red Dragon creature token with flying into play.
 abilities=flying
@@ -1271,21 +1259,7 @@ power=2
 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
diff --git a/projects/mtg/bin/Res/sets/ALA/todo.dat b/projects/mtg/bin/Res/sets/ALA/todo.dat
index 73abd504e..6d9766a0d 100644
--- a/projects/mtg/bin/Res/sets/ALA/todo.dat
+++ b/projects/mtg/bin/Res/sets/ALA/todo.dat
@@ -95,6 +95,20 @@ subtype=Elf Shaman
 toughness=1
 [/card]
 [card]
+text=When Blister Beetle comes into play, target creature gets -1/-1 until end of turn.
+#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
+target=creature
+auto=-1/-1 ueot
+id=174893
+name=Blister Beetle
+rarity=C
+type=Creature
+mana={1}{B}
+power=1
+subtype=Insect
+toughness=1
+[/card]
+[card]
 text={T}: Blood Cultist deals 1 damage to target creature.     Whenever a creature dealt damage by Blood Cultist this turn is put into a graveyard, put a +1/+1 counter on Blood Cultist.
 id=175100
 name=Blood Cultist
@@ -1295,7 +1309,22 @@ 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.
+#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
+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=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 f67f8eb18..cae7994de 100644
--- a/projects/mtg/bin/Res/sets/ARB/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ARB/_cards.dat
@@ -400,19 +400,6 @@ auto={T}:Untap target(*)
 type=Artifact
 [/card]
 [card]
-text=When Vithian Renegades comes into play, destroy target artifact.
-id=179535
-target=artifact
-auto=destroy
-name=Vithian Renegades
-rarity=U
-mana={1}{R}{G}
-type=Creature
-subtype=Human Shaman
-power=3
-toughness=2
-[/card]
-[card]
 text=Defender, flying, shroud
 id=179601
 name=Wall of Denial
diff --git a/projects/mtg/bin/Res/sets/ARB/todo.dat b/projects/mtg/bin/Res/sets/ARB/todo.dat
index e0af633f8..528732323 100644
--- a/projects/mtg/bin/Res/sets/ARB/todo.dat
+++ b/projects/mtg/bin/Res/sets/ARB/todo.dat
@@ -1054,7 +1054,20 @@ type=Instant
 text=Cascade (When you play this spell, remove cards from the top of your library from the game until you remove a nonland card that costs less. You may play it without paying its mana cost. Put the removed cards on the bottom in a random order.) Creatures you control get +1/+0 until end of turn.
 rarity=C
 [/card]
-
+[card]
+text=When Vithian Renegades comes into play, destroy target artifact.
+#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
+id=179535
+target=artifact
+auto=destroy
+name=Vithian Renegades
+rarity=U
+mana={1}{R}{G}
+type=Creature
+subtype=Human Shaman
+power=3
+toughness=2
+[/card]
 [card]
 id=180592
 name=Wargate
diff --git a/projects/mtg/bin/Res/sets/DIS/_cards.dat b/projects/mtg/bin/Res/sets/DIS/_cards.dat
index 63afb16bf..8858a7e83 100644
--- a/projects/mtg/bin/Res/sets/DIS/_cards.dat
+++ b/projects/mtg/bin/Res/sets/DIS/_cards.dat
@@ -58,19 +58,6 @@ 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}
@@ -83,19 +70,6 @@ abilities=flying
 rarity=U
 [/card]
 [card]
-id=107389
-name=Ogre Gatecrasher
-target=creature[defender]
-mana={3}{R}
-type=Creature
-subtype=Ogre Rogue
-power=3
-toughness=3
-text=When Ogre Gatecrasher enters the battlefield, destroy target creature with defender.
-auto=destroy
-rarity=C
-[/card]
-[card]
 id=97074
 name=Rakdos Ickspitter
 mana={1}{B}{R}
@@ -301,19 +275,6 @@ 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 fde6d826f..cfc9c81f5 100644
--- a/projects/mtg/bin/Res/sets/DIS/todo.dat
+++ b/projects/mtg/bin/Res/sets/DIS/todo.dat
@@ -635,7 +635,20 @@ 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
+#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
+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=107308
 name=Infernal Tutor
@@ -832,7 +845,20 @@ mana={U}{R}
 type=Instant
 text=Flip a coin. If it comes up heads, counter target instant or sorcery spell. If it comes up tails, copy that spell and you may choose new targets for the copy. rarity=R
 [/card]
-
+[card]
+id=107389
+name=Ogre Gatecrasher
+target=creature[defender]
+#does not work. "When ... enters the battelfield ...target ..." is not supported unless there is a "may"
+mana={3}{R}
+type=Creature
+subtype=Ogre Rogue
+power=3
+toughness=3
+text=When Ogre Gatecrasher enters the battlefield, destroy target creature with defender.
+auto=destroy
+rarity=C
+[/card]
 [card]
 id=83737
 name=Omnibian
@@ -1529,7 +1555,20 @@ 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
+#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
+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=97094
 name=Windreaver
diff --git a/projects/mtg/bin/Res/sets/EVE/_cards.dat b/projects/mtg/bin/Res/sets/EVE/_cards.dat
index 607f6fe8b..f63cfbc41 100644
--- a/projects/mtg/bin/Res/sets/EVE/_cards.dat
+++ b/projects/mtg/bin/Res/sets/EVE/_cards.dat
@@ -396,19 +396,6 @@ subtype=Bird
 toughness=3
 [/card]
 [card]
-text=When Marshdrinker Giant comes into play, destroy target Island or Swamp an opponent controls.
-target=island,swamp|opponentinplay
-auto=destroy
-id=142015
-name=Marshdrinker Giant
-rarity=U
-type=Creature
-mana={3}{G}{G}
-power=4
-subtype=Giant Warrior
-toughness=3
-[/card]
-[card]
 text={T}: Target creature gains flying until end of turn.     Whenever you play a blue spell, you may untap Merrow Levitator.
 auto={T}:flying target(creature)
 auto=@movedTo(*[blue]|mystack):may untap
@@ -876,4 +863,4 @@ mana={GU}{GU}{GU}
 power=2
 subtype=Merfolk Wizard
 toughness=2
-[/card]
+[/card]
diff --git a/projects/mtg/bin/Res/sets/EVE/todo.dat b/projects/mtg/bin/Res/sets/EVE/todo.dat
index 627b71290..36c0b11d0 100644
--- a/projects/mtg/bin/Res/sets/EVE/todo.dat
+++ b/projects/mtg/bin/Res/sets/EVE/todo.dat
@@ -591,7 +591,20 @@ rarity=R
 type=Enchantment
 mana={2}{W}{W}
 [/card]
-
+[card]
+text=When Marshdrinker Giant comes into play, destroy target Island or Swamp an opponent controls.
+target=island,swamp|opponentinplay
+#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
+auto=destroy
+id=142015
+name=Marshdrinker Giant
+rarity=U
+type=Creature
+mana={3}{G}{G}
+power=4
+subtype=Giant Warrior
+toughness=3
+[/card]
 [card]
 text={T}: Target player removes a card in his or her graveyard from the game.      Whenever you play a black spell, you may untap Merrow Bonegnawer.
 id=151158
diff --git a/projects/mtg/bin/Res/sets/EXO/_cards.dat b/projects/mtg/bin/Res/sets/EXO/_cards.dat
index dd0547ec0..147ae0607 100644
--- a/projects/mtg/bin/Res/sets/EXO/_cards.dat
+++ b/projects/mtg/bin/Res/sets/EXO/_cards.dat
@@ -363,19 +363,7 @@ power=1
 toughness=1
 abilities=haste
 [/card]
-[card]
-text=When Ravenous Baboons comes into play, destroy target nonbasic land.
-id=5207
-name=Ravenous Baboons
-target=land[-basic]
-mana={3}{R}
-type=Creature
-subtype=Ape
-auto=destroy
-power=2
-toughness=2
-rarity=R
-[/card]
+
 [card]
 text=Put target card from your graveyard on top of your library.
 target=*|mygraveyard
diff --git a/projects/mtg/bin/Res/sets/EXO/todo.dat b/projects/mtg/bin/Res/sets/EXO/todo.dat
index 7396aafd6..5a6a1a4e5 100644
--- a/projects/mtg/bin/Res/sets/EXO/todo.dat
+++ b/projects/mtg/bin/Res/sets/EXO/todo.dat
@@ -532,7 +532,20 @@ toughness=1
 text={X}{X}{B}: Destroy target nonblack creature with converted mana cost X.
 rarity=R
 [/card]
-
+[card]
+text=When Ravenous Baboons comes into play, destroy target nonbasic land.
+#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
+id=5207
+name=Ravenous Baboons
+target=land[-basic]
+mana={3}{R}
+type=Creature
+subtype=Ape
+auto=destroy
+power=2
+toughness=2
+rarity=R
+[/card]
 [card]
 id=6037
 name=Reaping the Rewards
diff --git a/projects/mtg/bin/Res/sets/FUT/_cards.dat b/projects/mtg/bin/Res/sets/FUT/_cards.dat
index fe206aba9..6a9ba2655 100644
--- a/projects/mtg/bin/Res/sets/FUT/_cards.dat
+++ b/projects/mtg/bin/Res/sets/FUT/_cards.dat
@@ -73,9 +73,9 @@ toughness=1
 abilities=flying
 [/card]
 [card]
-text=Enchant creature (Target a creature as you play this. This card comes into play attached to that creature.)    Creatures you control have haste.
+text=Enchant creature you control(Target a creature as you play this. This card comes into play attached to that creature.)    Creatures you control have haste.
 id=136215
-target=creature
+target=creature|myBattlefield
 name=Emblem of the Warmind
 rarity=U
 mana={1}{R}
diff --git a/projects/mtg/bin/Res/sets/GPT/_cards.dat b/projects/mtg/bin/Res/sets/GPT/_cards.dat
index f68cb1583..50e48a712 100644
--- a/projects/mtg/bin/Res/sets/GPT/_cards.dat
+++ b/projects/mtg/bin/Res/sets/GPT/_cards.dat
@@ -1,19 +1,4 @@
 [card]
-text=Flying   When Angel of Despair enters the battlefield, destroy target permanent.
-target=*
-auto=destroy
-id=83869
-name=Angel of Despair
-color=White,Black
-rarity=R
-mana={3}{W}{W}{B}{B}
-type=Creature
-subtype=Angel
-power=5
-toughness=5
-abilities=flying
-[/card]
-[card]
 text=Whenever an opponent discards a card, Abyssal Nocturnus gets +2/+2 and gains fear until end of turn. (It can't be blocked except by artifact creatures and/or black creatures.)
 id=96858
 name=Abyssal Nocturnus
@@ -211,19 +196,6 @@ 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
diff --git a/projects/mtg/bin/Res/sets/GPT/todo.dat b/projects/mtg/bin/Res/sets/GPT/todo.dat
index 039c21733..a73ae3130 100644
--- a/projects/mtg/bin/Res/sets/GPT/todo.dat
+++ b/projects/mtg/bin/Res/sets/GPT/todo.dat
@@ -12,16 +12,31 @@ rarity=C
 
 [card]
 id=96924
-name=Ætherplasm
+name=AEtherplasm
 mana={2}{U}{U}
 type=Creature
 subtype=Illusion
 power=1
 toughness=1
-text=Whenever Ætherplasm blocks a creature, you may return Ætherplasm to its owner's hand. If you do, you may put a creature card from your hand onto the battlefield blocking that creature.
+text=Whenever ÁEherplasm blocks a creature, you may return ÁEherplasm to its owner's hand. If you do, you may put a creature card from your hand onto the battlefield blocking that creature.
 rarity=U
 [/card]
-
+[card]
+text=Flying   When Angel of Despair enters the battlefield, destroy target permanent.
+target=*
+#Does not work currently. "When ... enters the battlefield ... target..." does not work unless there is a "may" condition
+auto=destroy
+id=83869
+name=Angel of Despair
+color=White,Black
+rarity=R
+mana={3}{W}{W}{B}{B}
+type=Creature
+subtype=Angel
+power=5
+toughness=5
+abilities=flying
+[/card]
 
 [card]
 id=96964
@@ -504,7 +519,7 @@ id=83630
 name=Invoke the Firemind
 mana={X}{U}{U}{R}
 type=Sorcery
-text=Choose one — Draw X cards; or Invoke the Firemind deals X damage to target creature or player.
+text=Choose one  EDraw X cards; or Invoke the Firemind deals X damage to target creature or player.
 rarity=R
 [/card]
 [card]
@@ -515,7 +530,20 @@ 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.
+#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
+target=instant,sorcery
+auto=moveTo(myhand)
+rarity=C
+[/card]
 [card]
 id=96966
 name=Izzet Guildmage
@@ -704,7 +732,7 @@ type=Creature
 subtype=Human Cleric
 power=1
 toughness=1
-text=Haunt (When this card is put into a graveyard from the battlefield, exile it haunting target creature.) When Orzhov Pontiff enters the battlefield or the creature it haunts is put into a graveyard, choose one — creatures you control get +1/+1 until end of turn; or creatures you don't control get -1/-1 until end of turn.
+text=Haunt (When this card is put into a graveyard from the battlefield, exile it haunting target creature.) When Orzhov Pontiff enters the battlefield or the creature it haunts is put into a graveyard, choose one  Ecreatures you control get +1/+1 until end of turn; or creatures you don't control get -1/-1 until end of turn.
 rarity=R
 [/card]
 
diff --git a/projects/mtg/bin/Res/sets/INV/_cards.dat b/projects/mtg/bin/Res/sets/INV/_cards.dat
index 53e7571f1..3b85557ca 100644
--- a/projects/mtg/bin/Res/sets/INV/_cards.dat
+++ b/projects/mtg/bin/Res/sets/INV/_cards.dat
@@ -321,20 +321,6 @@ toughness=2
 abilities=protection from black
 [/card]
 [card]
-text=Flying, protection from white. When Crypt Angel comes into play, return target blue or red creature card from your graveyard to your hand.
-id=23320
-name=Crypt Angel
-target=creature[blue;red]|mygraveyard
-auto=moveTo(myhand)
-rarity=R
-type=Creature
-mana={4}{B}
-power=3
-subtype=Angel
-toughness=3
-abilities=flying,protection from white 
-[/card]
-[card]
 text=Enchant creature   Enchanted creature gets -1/-1 and has fear.
 target=creature
 auto=-1/-1
diff --git a/projects/mtg/bin/Res/sets/INV/todo.dat b/projects/mtg/bin/Res/sets/INV/todo.dat
index 98922cc5b..0897d364c 100644
--- a/projects/mtg/bin/Res/sets/INV/todo.dat
+++ b/projects/mtg/bin/Res/sets/INV/todo.dat
@@ -313,7 +313,21 @@ type=Enchantment
 mana={R}
 subtype=Aura
 [/card]
-
+[card]
+text=Flying, protection from white. When Crypt Angel comes into play, return target blue or red creature card from your graveyard to your hand.
+id=23320
+name=Crypt Angel
+target=creature[blue;red]|mygraveyard
+#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
+auto=moveTo(myhand)
+rarity=R
+type=Creature
+mana={4}{B}
+power=3
+subtype=Angel
+toughness=3
+abilities=flying,protection from white 
+[/card]
 [card]
 text=Change the text of target spell or permanent by replacing all instances of one color word or basic land type with another until end of turn.       Draw a card.
 id=23008
diff --git a/projects/mtg/bin/Res/sets/LRW/_cards.dat b/projects/mtg/bin/Res/sets/LRW/_cards.dat
index 1994cfc24..f5678e45c 100644
--- a/projects/mtg/bin/Res/sets/LRW/_cards.dat
+++ b/projects/mtg/bin/Res/sets/LRW/_cards.dat
@@ -521,19 +521,7 @@ rarity=L
 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])
@@ -946,19 +934,6 @@ 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 7ba31a140..b8dc81416 100644
--- a/projects/mtg/bin/Res/sets/LRW/todo.dat
+++ b/projects/mtg/bin/Res/sets/LRW/todo.dat
@@ -1029,6 +1029,20 @@ subtype=Kithkin Soldier
 toughness=2
 [/card]
 [card]
+text=When Kinsbaile Skirmisher enters the battlefield, target creature gets +1/+1 until end of turn.
+#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
+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=When Kithkin Harbinger comes into play, you may search your library for a Kithkin card, reveal it, then shuffle your library and put that card on top of it.
 id=139399
 name=Kithkin Harbinger
@@ -1597,7 +1611,20 @@ power=1
 subtype=Faerie Wizard
 toughness=1
 [/card]
-
+[card]
+text=When Spiderwig Boggart enters the battlefield, target creature gains fear until end of turn.
+#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
+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=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 27adcc41f..2a3577474 100644
--- a/projects/mtg/bin/Res/sets/M10/_cards.dat
+++ b/projects/mtg/bin/Res/sets/M10/_cards.dat
@@ -1577,19 +1577,6 @@ 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 afcc61bc4..b060ad8fb 100644
--- a/projects/mtg/bin/Res/sets/M10/todo.dat
+++ b/projects/mtg/bin/Res/sets/M10/todo.dat
@@ -551,7 +551,20 @@ target=creature
 auto=@each ??? upkeep:life:-1 targetController
 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.
+#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
+auto=damage:1
+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 837203b78..a8c3ba348 100644
--- a/projects/mtg/bin/Res/sets/MOR/_cards.dat
+++ b/projects/mtg/bin/Res/sets/MOR/_cards.dat
@@ -1,264 +1,251 @@
-[card]
-text=When Ambassador Oak comes enters the battlefield, put a 1/1 green Elf Warrior creature token onto the battlefield.
-id=152998
-name=Ambassador Oak
-auto=token(Elf Warrior,creature elf,1/1,green)
-rarity=C
-mana={3}{G}
-type=Creature
-subtype=Treefolk Warrior
-power=3
-toughness=3
-[/card]
-[card]
-text=At the beginning of your upkeep, you lose 1 life and put a 1/1 black Faerie Rogue creature token with flying into play.
-auto=@each my upkeep:life-1 controller
-auto=@each my upkeep:token(Faerie,creature faerie,1/1,flying black)
-id=152648
-name=Bitterblossom
-rarity=R
-mana={1}{B}
-type=Enchantment
-subtype=Faerie
-[/card]
-[card]
-text={T}, Pay 1 life: Add {G} to your mana pool.
-id=152705
-auto={T}:Add {G} && life:-1 controller
-name=Blightsoil Druid
-rarity=C
-mana={1}{B}
-type=Creature
-subtype=Elf Druid
-power=1
-toughness=2
-[/card]
-[card]
-text=Trample Borderland Behemoth gets +4/+4 for each other Giant you control.
-id=153102
-name=Borderland Behemoth
-auto=foreach(giant|myBattlefield):4/4 other
-rarity=R
-mana={5}{R}{R}
-type=Creature
-subtype=Giant Warrior
-power=4
-toughness=4
-abilities=trample
-[/card]
-[card]
-text=Enchant creature {1}{W}: Put a +1/+1 counter on enchanted creature.
-id=152838
-name=Daily Regimen
-target=creature
-auto={1}{W}:counter(1/1)
-rarity=U
-mana={W}
-type=Enchantment
-subtype=Aura
-[/card]
-[card]
-text=Return target nonland permanent to its owner's hand.
-id=152727
-name=Disperse
-target=creature,artifact,enchantment
-auto=moveTo(ownerHand)
-rarity=C
-mana={1}{U}
-type=Instant
-[/card]
-[card]
-text=
-id=153003
-name=Elvish Warrior
-rarity=C
-mana={G}{G}
-type=Creature
-subtype=Elf Warrior
-power=2
-toughness=3
-[/card]
-[card]
-text=Flying   {U}: Put Fencer Clique on top of its owner's library.
-id=157424
-name=Fencer Clique
-rarity=C
-mana={2}{U}{U}
-auto={U}:moveTo(ownerlibrary)
-type=Creature
-subtype=Faerie Soldier
-power=3
-toughness=2
-abilities=flying
-[/card]
-[card]
-text=Festercreep comes into play with a +1/+1 counter on it. {1}{B}, Remove a +1/+1 counter from Festercreep: All other creatures get -1/-1 until end of turn.
-id=152944
-name=Festercreep
-rarity=C
-mana={1}{B}
-auto=counter(1/1)
-auto={1}{B}:counter(1/1,-1) && lord(creature) -1/-1
-type=Creature
-subtype=Elemental
-power=0
-toughness=0
-[/card]
-[card]
-text=Search your library for an enchantment card, reveal it, and put it into your hand. Then shuffle your library.
-id=152938
-name=Idyllic Tutor
-rarity=R
-mana={2}{W}
-auto=moveTo(myhand) target(enchantment|myLibrary)
-type=Sorcery
-[/card]
-[card]
-text=
-id=152967
-name=Indomitable Ancients
-rarity=R
-mana={2}{W}{W}
-type=Creature
-subtype=Treefolk Warrior
-power=2
-toughness=10
-[/card]
-[card]
-text=Target creature gets +1/+0 and gains first strike until end of turn.
-id=152563
-name=Kindled Fury
-target=creature
-auto=1/0
-auto=first strike
-rarity=C
-mana={R}
-type=Instant
-[/card]
-[card]
-name=Inspired Sprite
-mana={U}{3}
-type=Creature
-subtype=Faerie Wizard
-text=Flash. Flying. Whenever you cast a Wizard spell, you may untap Inspired Sprite. {T}: Draw a card, then discard a card.
-abilities=flash,flying
-auto=@movedTo(wizard|mystack):may untap
-auto={T}:draw:1 && moveto(graveyard) target(*|myhand)
-power=2
-toughness=2
-rarity=U
-[/card]
-[card]
-text=Knight creatures you control have double strike.
-id=153279
-auto=lord(creature|mybattlefield) double strike
-name=Kinsbaile Cavalier
-rarity=R
-mana={3}{W}
-type=Creature
-subtype=Kithkin Knight
-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
-alias=1167
-rarity=R
-mana={X}{B}{B}
-type=Sorcery
-[/card]
-[card]
-text=Draw X cards.
-id=152628
-name=Mind Spring
-alias=1192
-rarity=R
-mana={X}{U}{U}
-type=Sorcery
-[/card]
-[card]
-text=Counter target noncreature spell.
-id=152570
-target=*[-creature]|stack
-auto=fizzle
-name=Negate
-rarity=C
-mana={1}{U}
-type=Instant
-[/card]
-[card]
-text=Fear
-id=152718
-name=Prickly Boggart
-rarity=C
-mana={B}
-type=Creature
-subtype=Goblin Rogue
-power=1
-toughness=1
-abilities=fear
-[/card]
-[card]
-text=Sacrifice an Elemental: Seething Pathblazer gets +2/+0 and gains first strike until end of turn.
-id=153101
-name=Seething Pathblazer
-auto={S(elemental|myBattlefield)}:2/0 && first strike
-rarity=C
-mana={2}{R}
-type=Creature
-subtype=Elemental Warrior
-power=2
-toughness=2
-[/card]
-[card]
-text=Vengeful Firebrand has haste as long as a Warrior card is in your graveyard. R: Vengeful Firebrand gets +1/+0 until end of turn.
-id=153153
-name=Vengeful Firebrand
-auto=aslongas(warrior|mygraveyard) haste
-auto={R}:1/0
-rarity=R
-mana={3}{R}
-type=Creature
-subtype=Elemental Warrior
-power=5
-toughness=2
-[/card]
-[card]
-text=Destroy target nonblack creature. Put a 1/1 black Faerie Rogue creature token with flying into play.
-id=157426
-target=creature[-black]
-auto=destroy
-auto=token(Faerie Rogue,Creature Faerie,1/1,flying black)
-name=Violet Pall
-rarity=C
-mana={4}{B}
-type=Tribal Instant
-subtype=Faerie
-[/card]
-[card]
-text={3}{B}, Sacrifice a Goblin: Put two 1/1 black Goblin Rogue creature tokens onto the battlefield.
-id=153011
-auto={3}{B}{S(goblin|myBattlefield)}:token(Goblin Rogue,Creature Goblin,1/1,black) && token(Goblin Rogue,Creature Goblin,1/1,black)
-name=Weirding Shaman
-rarity=R
-mana={1}{B}
-type=Creature
-subtype=Goblin Shaman
-power=2
-toughness=1
+[card]
+text=When Ambassador Oak comes enters the battlefield, put a 1/1 green Elf Warrior creature token onto the battlefield.
+id=152998
+name=Ambassador Oak
+auto=token(Elf Warrior,creature elf,1/1,green)
+rarity=C
+mana={3}{G}
+type=Creature
+subtype=Treefolk Warrior
+power=3
+toughness=3
+[/card]
+[card]
+text=At the beginning of your upkeep, you lose 1 life and put a 1/1 black Faerie Rogue creature token with flying into play.
+auto=@each my upkeep:life-1 controller
+auto=@each my upkeep:token(Faerie,creature faerie,1/1,flying black)
+id=152648
+name=Bitterblossom
+rarity=R
+mana={1}{B}
+type=Enchantment
+subtype=Faerie
+[/card]
+[card]
+text={T}, Pay 1 life: Add {G} to your mana pool.
+id=152705
+auto={T}:Add {G} && life:-1 controller
+name=Blightsoil Druid
+rarity=C
+mana={1}{B}
+type=Creature
+subtype=Elf Druid
+power=1
+toughness=2
+[/card]
+[card]
+text=Trample Borderland Behemoth gets +4/+4 for each other Giant you control.
+id=153102
+name=Borderland Behemoth
+auto=foreach(giant|myBattlefield):4/4 other
+rarity=R
+mana={5}{R}{R}
+type=Creature
+subtype=Giant Warrior
+power=4
+toughness=4
+abilities=trample
+[/card]
+[card]
+text=Enchant creature {1}{W}: Put a +1/+1 counter on enchanted creature.
+id=152838
+name=Daily Regimen
+target=creature
+auto={1}{W}:counter(1/1)
+rarity=U
+mana={W}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
+text=Return target nonland permanent to its owner's hand.
+id=152727
+name=Disperse
+target=creature,artifact,enchantment
+auto=moveTo(ownerHand)
+rarity=C
+mana={1}{U}
+type=Instant
+[/card]
+[card]
+text=
+id=153003
+name=Elvish Warrior
+rarity=C
+mana={G}{G}
+type=Creature
+subtype=Elf Warrior
+power=2
+toughness=3
+[/card]
+[card]
+text=Flying   {U}: Put Fencer Clique on top of its owner's library.
+id=157424
+name=Fencer Clique
+rarity=C
+mana={2}{U}{U}
+auto={U}:moveTo(ownerlibrary)
+type=Creature
+subtype=Faerie Soldier
+power=3
+toughness=2
+abilities=flying
+[/card]
+[card]
+text=Festercreep comes into play with a +1/+1 counter on it. {1}{B}, Remove a +1/+1 counter from Festercreep: All other creatures get -1/-1 until end of turn.
+id=152944
+name=Festercreep
+rarity=C
+mana={1}{B}
+auto=counter(1/1)
+auto={1}{B}:counter(1/1,-1) && lord(creature) -1/-1
+type=Creature
+subtype=Elemental
+power=0
+toughness=0
+[/card]
+[card]
+text=Search your library for an enchantment card, reveal it, and put it into your hand. Then shuffle your library.
+id=152938
+name=Idyllic Tutor
+rarity=R
+mana={2}{W}
+auto=moveTo(myhand) target(enchantment|myLibrary)
+type=Sorcery
+[/card]
+[card]
+text=
+id=152967
+name=Indomitable Ancients
+rarity=R
+mana={2}{W}{W}
+type=Creature
+subtype=Treefolk Warrior
+power=2
+toughness=10
+[/card]
+[card]
+text=Target creature gets +1/+0 and gains first strike until end of turn.
+id=152563
+name=Kindled Fury
+target=creature
+auto=1/0
+auto=first strike
+rarity=C
+mana={R}
+type=Instant
+[/card]
+[card]
+name=Inspired Sprite
+mana={U}{3}
+type=Creature
+subtype=Faerie Wizard
+text=Flash. Flying. Whenever you cast a Wizard spell, you may untap Inspired Sprite. {T}: Draw a card, then discard a card.
+abilities=flash,flying
+auto=@movedTo(wizard|mystack):may untap
+auto={T}:draw:1 && moveto(graveyard) target(*|myhand)
+power=2
+toughness=2
+rarity=U
+[/card]
+[card]
+text=Knight creatures you control have double strike.
+id=153279
+auto=lord(creature|mybattlefield) double strike
+name=Kinsbaile Cavalier
+rarity=R
+mana={3}{W}
+type=Creature
+subtype=Kithkin Knight
+power=2
+toughness=2
+[/card]
+[card]
+text=Target player discards X cards at random.
+id=157422
+name=Mind Shatter
+alias=1167
+rarity=R
+mana={X}{B}{B}
+type=Sorcery
+[/card]
+[card]
+text=Draw X cards.
+id=152628
+name=Mind Spring
+alias=1192
+rarity=R
+mana={X}{U}{U}
+type=Sorcery
+[/card]
+[card]
+text=Counter target noncreature spell.
+id=152570
+target=*[-creature]|stack
+auto=fizzle
+name=Negate
+rarity=C
+mana={1}{U}
+type=Instant
+[/card]
+[card]
+text=Fear
+id=152718
+name=Prickly Boggart
+rarity=C
+mana={B}
+type=Creature
+subtype=Goblin Rogue
+power=1
+toughness=1
+abilities=fear
+[/card]
+[card]
+text=Sacrifice an Elemental: Seething Pathblazer gets +2/+0 and gains first strike until end of turn.
+id=153101
+name=Seething Pathblazer
+auto={S(elemental|myBattlefield)}:2/0 && first strike
+rarity=C
+mana={2}{R}
+type=Creature
+subtype=Elemental Warrior
+power=2
+toughness=2
+[/card]
+[card]
+text=Vengeful Firebrand has haste as long as a Warrior card is in your graveyard. R: Vengeful Firebrand gets +1/+0 until end of turn.
+id=153153
+name=Vengeful Firebrand
+auto=aslongas(warrior|mygraveyard) haste
+auto={R}:1/0
+rarity=R
+mana={3}{R}
+type=Creature
+subtype=Elemental Warrior
+power=5
+toughness=2
+[/card]
+[card]
+text=Destroy target nonblack creature. Put a 1/1 black Faerie Rogue creature token with flying into play.
+id=157426
+target=creature[-black]
+auto=destroy
+auto=token(Faerie Rogue,Creature Faerie,1/1,flying black)
+name=Violet Pall
+rarity=C
+mana={4}{B}
+type=Tribal Instant
+subtype=Faerie
+[/card]
+[card]
+text={3}{B}, Sacrifice a Goblin: Put two 1/1 black Goblin Rogue creature tokens onto the battlefield.
+id=153011
+auto={3}{B}{S(goblin|myBattlefield)}:token(Goblin Rogue,Creature Goblin,1/1,black) && token(Goblin Rogue,Creature Goblin,1/1,black)
+name=Weirding Shaman
+rarity=R
+mana={1}{B}
+type=Creature
+subtype=Goblin Shaman
+power=2
+toughness=1
 [/card]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/sets/MOR/todo.dat b/projects/mtg/bin/Res/sets/MOR/todo.dat
index 0f98f46d3..cab41bbe0 100644
--- a/projects/mtg/bin/Res/sets/MOR/todo.dat
+++ b/projects/mtg/bin/Res/sets/MOR/todo.dat
@@ -540,7 +540,7 @@ type=Creature
 subtype=Merfolk Wizard
 power=2
 toughness=1
-text=Kinship — At the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Ink Dissolver, you may reveal it. If you do, each opponent puts the top three cards of his or her library into his or her graveyard.
+text=Kinship  EAt the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Ink Dissolver, you may reveal it. If you do, each opponent puts the top three cards of his or her library into his or her graveyard.
 rarity=C
 [/card]
 [card]
@@ -592,7 +592,7 @@ type=Creature
 subtype=Kithkin Soldier
 power=2
 toughness=2
-text=Kinship — At the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Kithkin Zephyrnaut, you may reveal it. If you do, Kithkin Zephyrnaut gets +2/+2 and gains flying and vigilance until end of turn.
+text=Kinship  EAt the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Kithkin Zephyrnaut, you may reveal it. If you do, Kithkin Zephyrnaut gets +2/+2 and gains flying and vigilance until end of turn.
 rarity=C
 [/card]
 [card]
@@ -623,7 +623,7 @@ type=Creature
 subtype=Treefolk Shaman
 power=3
 toughness=5
-text=Kinship — At the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Leaf-Crowned Elder, you may reveal it. If you do, you may play that card without paying its mana cost.
+text=Kinship  EAt the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Leaf-Crowned Elder, you may reveal it. If you do, you may play that card without paying its mana cost.
 rarity=R
 [/card]
 [card]
@@ -689,7 +689,20 @@ 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
+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.
+#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
+auto=deplete:1
+rarity=C
+[/card]
 [card]
 id=157422
 name=Mind Shatter
@@ -756,7 +769,7 @@ type=Creature
 subtype=Goblin Warrior
 power=1
 toughness=1
-text=Kinship — At the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Mudbutton Clanger, you may reveal it. If you do, Mudbutton Clanger gets +1/+1 until end of turn.
+text=Kinship  EAt the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Mudbutton Clanger, you may reveal it. If you do, Mudbutton Clanger gets +1/+1 until end of turn.
 rarity=C
 [/card]
 [card]
@@ -803,7 +816,7 @@ type=Creature
 subtype=Faerie Wizard
 power=3
 toughness=2
-text=Flying Kinship — At the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Nightshade Schemers, you may reveal it. If you do, each opponent loses 2 life.
+text=Flying Kinship  EAt the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Nightshade Schemers, you may reveal it. If you do, each opponent loses 2 life.
 rarity=U
 [/card]
 [card]
@@ -931,7 +944,7 @@ type=Creature
 subtype=Elemental Shaman
 power=3
 toughness=3
-text=Kinship — At the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Pyroclast Consul, you may reveal it. If you do, Pyroclast Consul deals 2 damage to each creature.
+text=Kinship  EAt the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Pyroclast Consul, you may reveal it. If you do, Pyroclast Consul deals 2 damage to each creature.
 rarity=U
 [/card]
 [card]
@@ -1107,7 +1120,7 @@ type=Creature
 subtype=Goblin Shaman
 power=2
 toughness=2
-text=Kinship — At the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Sensation Gorger, you may reveal it. If you do, each player discards his or her hand and draws four cards.
+text=Kinship  EAt the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Sensation Gorger, you may reveal it. If you do, each player discards his or her hand and draws four cards.
 rarity=R
 [/card]
 [card]
@@ -1181,7 +1194,7 @@ type=Creature
 subtype=Goblin Shaman
 power=3
 toughness=2
-text=Kinship — At the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Squeaking Pie Grubfellows, you may reveal it. If you do, each opponent discards a card.
+text=Kinship  EAt the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Squeaking Pie Grubfellows, you may reveal it. If you do, each opponent discards a card.
 rarity=C
 [/card]
 [card]
@@ -1406,7 +1419,7 @@ type=Creature
 subtype=Giant Wizard
 power=4
 toughness=4
-text=Kinship — At the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Wandering Graybeard, you may reveal it. If you do, you gain 4 life.
+text=Kinship  EAt the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Wandering Graybeard, you may reveal it. If you do, you gain 4 life.
 rarity=U
 [/card]
 [card]
@@ -1437,7 +1450,7 @@ type=Creature
 subtype=Merfolk Wizard
 power=3
 toughness=3
-text=Kinship — At the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Waterspout Weavers, you may reveal it. If you do, each creature you control gains flying until end of turn.
+text=Kinship  EAt the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Waterspout Weavers, you may reveal it. If you do, each creature you control gains flying until end of turn.
 rarity=U
 [/card]
 [card]
@@ -1479,7 +1492,7 @@ type=Creature
 subtype=Elf Warrior
 power=3
 toughness=2
-text=Kinship — At the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Winnower Patrol, you may reveal it. If you do, put a +1/+1 counter on Winnower Patrol.
+text=Kinship  EAt the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Winnower Patrol, you may reveal it. If you do, put a +1/+1 counter on Winnower Patrol.
 rarity=C
 [/card]
 [card]
@@ -1490,6 +1503,6 @@ type=Creature
 subtype=Elf Shaman
 power=2
 toughness=2
-text=Kinship — At the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Wolf-Skull Shaman, you may reveal it. If you do, put a 2/2 green Wolf creature token onto the battlefield.
+text=Kinship  EAt the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Wolf-Skull Shaman, you may reveal it. If you do, put a 2/2 green Wolf creature token onto the battlefield.
 rarity=U
 [/card]
diff --git a/projects/mtg/bin/Res/sets/MRD/_cards.dat b/projects/mtg/bin/Res/sets/MRD/_cards.dat
index 33d0f2d10..a3be69bd3 100644
--- a/projects/mtg/bin/Res/sets/MRD/_cards.dat
+++ b/projects/mtg/bin/Res/sets/MRD/_cards.dat
@@ -531,7 +531,7 @@ rarity=C
 mana={2}{R}
 type=Creature
 subtype=Goblin Warrior
-
+
 power=2
 toughness=2
 [/card]
@@ -626,20 +626,7 @@ subtype=Juggernaut
 power=10
 toughness=10
 [/card]
-[card]
-text=Flying. When Looming Hoverguard enters the battlefield, put target artifact on top of its owner's library.
-target=artifact
-auto=moveTo(ownerLibrary)
-id=48114
-name=Looming Hoverguard
-rarity=U
-mana={4}{U}{U}
-type=Creature
-subtype=Drone
-power=3
-toughness=3
-abilities=flying
-[/card]
+
 [card]
 text={W}, {T}: Regenerate target artifact.
 auto={W}{T}:regenerate target(artifact)
@@ -1367,16 +1354,3 @@ power=1
 toughness=4
 abilities=vigilance
 [/card]
-[card]
-text=When Viridian Shaman comes into play, destroy target artifact.
-target=artifact
-auto=destroy
-id=46119
-name=Viridian Shaman
-rarity=U
-type=Creature
-mana={2}{G}
-power=2
-subtype=Elf Shaman
-toughness=2
-[/card]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/sets/MRD/todo.dat b/projects/mtg/bin/Res/sets/MRD/todo.dat
index 67e8f69c5..7c5eee0f5 100644
--- a/projects/mtg/bin/Res/sets/MRD/todo.dat
+++ b/projects/mtg/bin/Res/sets/MRD/todo.dat
@@ -679,7 +679,21 @@ power=2
 subtype=Myr
 toughness=2
 [/card]
-
+[card]
+text=Flying. When Looming Hoverguard enters the battlefield, put target artifact on top of its owner's library.
+target=artifact
+#does not work. "When ...enters the battlefield ... target..." does not work unless there is a "may"
+auto=moveTo(ownerLibrary)
+id=48114
+name=Looming Hoverguard
+rarity=U
+mana={4}{U}{U}
+type=Creature
+subtype=Drone
+power=3
+toughness=3
+abilities=flying
+[/card]
 [card]
 text=At the beginning of your upkeep, the player with the lowest life total gains control of Loxodon Peacekeeper. If two or more players are tied for lowest life total, you choose one of them, and that player gains control of Loxodon Peacekeeper.
 id=48180
@@ -1573,7 +1587,20 @@ type=Artifact
 mana={1}
 subtype=Equipment
 [/card]
-
+[card]
+text=When Viridian Shaman comes into play, destroy target artifact.
+target=artifact
+#"when ... comes into play .. target..." are not supported unless there is a "may"
+auto=destroy
+id=46119
+name=Viridian Shaman
+rarity=U
+type=Creature
+mana={2}{G}
+power=2
+subtype=Elf Shaman
+toughness=2
+[/card]
 [card]
 text=Equipped creature has trample and can't be blocked by more than one creature.     Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery. This card comes into play unattached and stays in play if the creature leaves play.)
 id=46053
diff --git a/projects/mtg/bin/Res/sets/ODY/_cards.dat b/projects/mtg/bin/Res/sets/ODY/_cards.dat
index da0694fba..8a1ce8408 100644
--- a/projects/mtg/bin/Res/sets/ODY/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ODY/_cards.dat
@@ -98,20 +98,6 @@ toughness=2
 rarity=U
 [/card]
 [card]
-text=Flying (This creature can't be blocked except by creatures with flying or reach.)   When Aven Cloudchaser comes into play, destroy target enchantment.
-id=29694
-name=Aven Cloudchaser
-target=enchantment
-abilities=flying
-auto=destroy
-rarity=C
-type=Creature
-mana={3}{W}
-power=2
-subtype=Bird Soldier
-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) from(inplay):may draw:1
 id=31815
@@ -1376,4 +1362,4 @@ auto=moveTo(myinplay)
 mana={3}{B}
 type=Sorcery
 rarity=U
-[/card]
+[/card]
diff --git a/projects/mtg/bin/Res/sets/ODY/todo.dat b/projects/mtg/bin/Res/sets/ODY/todo.dat
index 32edd233b..d075fd73c 100644
--- a/projects/mtg/bin/Res/sets/ODY/todo.dat
+++ b/projects/mtg/bin/Res/sets/ODY/todo.dat
@@ -79,7 +79,21 @@ rarity=U
 type=Instant
 mana={1}{U}
 [/card]
-
+[card]
+text=Flying (This creature can't be blocked except by creatures with flying or reach.)   When Aven Cloudchaser comes into play, destroy target enchantment.
+id=29694
+name=Aven Cloudchaser
+target=enchantment
+#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
+abilities=flying
+auto=destroy
+rarity=C
+type=Creature
+mana={3}{W}
+power=2
+subtype=Bird Soldier
+toughness=2
+[/card]
 [card]
 text=Whenever a player plays a spell, that player gains X life, where X is the number of cards in all graveyards with the same name as that spell.
 id=29923
diff --git a/projects/mtg/bin/Res/sets/POR/_cards.dat b/projects/mtg/bin/Res/sets/POR/_cards.dat
index 58a9fea38..47b574fef 100644
--- a/projects/mtg/bin/Res/sets/POR/_cards.dat
+++ b/projects/mtg/bin/Res/sets/POR/_cards.dat
@@ -482,19 +482,6 @@ toughness=1
 abilities=flying
 [/card]
 [card]
-text=When Fire Imp comes into play, it deals 2 damage to target creature.
-target=creature
-auto=damage:2
-id=4337
-name=Fire Imp
-rarity=U
-mana={2}{R}
-type=Creature
-subytpe=Imp
-power=2
-toughness=1
-[/card]
-[card]
 text=Fire Tempest deals 6 damage to each creature and each player.
 id=4339
 name=Fire Tempest
@@ -818,19 +805,6 @@ 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 2b002a32a..3927a2644 100644
--- a/projects/mtg/bin/Res/sets/POR/todo.dat
+++ b/projects/mtg/bin/Res/sets/POR/todo.dat
@@ -169,6 +169,20 @@ subtype=Dragon
 toughness=6
 [/card]
 [card]
+text=When Fire Imp comes into play, it deals 2 damage to target creature.
+#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
+target=creature
+auto=damage:2
+id=4337
+name=Fire Imp
+rarity=U
+mana={2}{R}
+type=Creature
+subytpe=Imp
+power=2
+toughness=1
+[/card]
+[card]
 text=When Fire Snake is put into a graveyard from play, destroy target land.
 id=4338
 name=Fire Snake
@@ -241,7 +255,20 @@ 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.
+#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
+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]
 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 e80807aee..5945d7a4d 100644
--- a/projects/mtg/bin/Res/sets/RAV/_cards.dat
+++ b/projects/mtg/bin/Res/sets/RAV/_cards.dat
@@ -520,21 +520,7 @@ auto={T}:forestwalk target(creature)
 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
@@ -851,19 +837,7 @@ power=3
 toughness=2
 abilities=flying
 [/card]
-[card]
-text=When Sparkmage Apprentice comes into play, it deals 1 damage to target creature or player.
-id=87967
-name=Sparkmage Apprentice
-target=creature,player
-auto=Damage:1
-rarity=C
-mana={1}{R}
-type=Creature
-subtype=Human Wizard
-power=1
-toughness=1
-[/card]
+
 [card]
 text=Whenever a land comes into play under your control, untap Stone-Seeder Hierophant.     {T}: Untap target land.
 id=89041
diff --git a/projects/mtg/bin/Res/sets/RAV/todo.dat b/projects/mtg/bin/Res/sets/RAV/todo.dat
index 97b7032a6..9ff5d7fe1 100644
--- a/projects/mtg/bin/Res/sets/RAV/todo.dat
+++ b/projects/mtg/bin/Res/sets/RAV/todo.dat
@@ -991,7 +991,22 @@ 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.
+#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
+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=Put a card in your hand on top of your library: Return Leashling to its owner's hand.
 id=89008
@@ -1589,6 +1604,20 @@ subtype=Gorgon
 toughness=5
 [/card]
 [card]
+text=When Sparkmage Apprentice comes into play, it deals 1 damage to target creature or player.
+#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
+id=87967
+name=Sparkmage Apprentice
+target=creature,player
+auto=Damage:1
+rarity=C
+mana={1}{R}
+type=Creature
+subtype=Human Wizard
+power=1
+toughness=1
+[/card]
+[card]
 text=When Spawnbroker comes into play, you may exchange control of target creature you control and target creature with power less than or equal to that creature's power an opponent controls.
 id=83748
 name=Spawnbroker
diff --git a/projects/mtg/bin/Res/sets/SHM/_cards.dat b/projects/mtg/bin/Res/sets/SHM/_cards.dat
index 4de1dde35..d4c890230 100644
--- a/projects/mtg/bin/Res/sets/SHM/_cards.dat
+++ b/projects/mtg/bin/Res/sets/SHM/_cards.dat
@@ -247,19 +247,6 @@ 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 1f82621d3..b25e6708e 100644
--- a/projects/mtg/bin/Res/sets/SHM/todo.dat
+++ b/projects/mtg/bin/Res/sets/SHM/todo.dat
@@ -193,7 +193,20 @@ rarity=C
 type=Instant
 mana={R}
 [/card]
-
+[card]
+text=When Cultbrand Cinder comes into play, put a -1/-1 counter on target creature.
+#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
+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=Sacrifice Cursecatcher: Counter target instant or sorcery spell unless its controller pays {1}.
 id=158763
diff --git a/projects/mtg/bin/Res/sets/TMP/_cards.dat b/projects/mtg/bin/Res/sets/TMP/_cards.dat
index 624e7cfd2..945996ecd 100644
--- a/projects/mtg/bin/Res/sets/TMP/_cards.dat
+++ b/projects/mtg/bin/Res/sets/TMP/_cards.dat
@@ -130,7 +130,7 @@ rarity=C
 mana={B}
 type=Creature
 subtype=Thrull
-
+
 auto={S}: Add{B}
 power=1
 toughness=1
@@ -270,20 +270,7 @@ subtype=Sliver
 power=1
 toughness=1
 [/card]
-[card]
-text=Flying     When Cloudchaser Eagle comes into play, destroy target enchantment.
-abilities=flying
-id=4871
-name=Cloudchaser Eagle
-target=enchantment
-auto=destroy 
-rarity=C
-type=Creature
-mana={3}{W}
-power=2
-subtype=Bird
-toughness=2
-[/card]
+
 [card]
 text=First strike
 id=4599
diff --git a/projects/mtg/bin/Res/sets/TMP/todo.dat b/projects/mtg/bin/Res/sets/TMP/todo.dat
index 14671e474..fa2e37e7b 100644
--- a/projects/mtg/bin/Res/sets/TMP/todo.dat
+++ b/projects/mtg/bin/Res/sets/TMP/todo.dat
@@ -176,7 +176,21 @@ power=1
 subtype=Human Cleric
 toughness=1
 [/card]
-
+[card]
+text=Flying     When Cloudchaser Eagle comes into play, destroy target enchantment.
+#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
+abilities=flying
+id=4871
+name=Cloudchaser Eagle
+target=enchantment
+auto=destroy 
+rarity=C
+type=Creature
+mana={3}{W}
+power=2
+subtype=Bird
+toughness=2
+[/card]
 [card]
 text=Target opponent reveals his or her hand. Choose a card from it. That player discards that card.
 id=4641
diff --git a/projects/mtg/bin/Res/sets/TSP/_cards.dat b/projects/mtg/bin/Res/sets/TSP/_cards.dat
index ef6905a92..2f8ed61b8 100644
--- a/projects/mtg/bin/Res/sets/TSP/_cards.dat
+++ b/projects/mtg/bin/Res/sets/TSP/_cards.dat
@@ -712,20 +712,7 @@ text={T}, Sacrifice Terramorphic Expanse: Search your library for a basic land c
 auto={T}{S}:moveTo(myinplay) target(basic|mylibrary) && tap
 rarity=C
 [/card]
-[card]
-id=116736
-name=Tivadar of Thorn
-mana={1}{W}{W}
-type=Creature
-subtype=Human Knight
-text=First strike, protection from red When Tivadar of Thorn comes into play, destroy target Goblin.
-abilities=first strike, protection from red, legendary
-target=goblin
-auto=destroy
-power=2
-toughness=2
-rarity=R
-[/card]
+
 [card]
 id=108907
 name=Tolarian Sentinel
diff --git a/projects/mtg/bin/Res/sets/TSP/todo.dat b/projects/mtg/bin/Res/sets/TSP/todo.dat
index b4e3f2297..a09acb47e 100644
--- a/projects/mtg/bin/Res/sets/TSP/todo.dat
+++ b/projects/mtg/bin/Res/sets/TSP/todo.dat
@@ -2001,7 +2001,21 @@ type=Artifact
 text={T}: Add {W} to your mana pool. {1}{W}{W}: Thunder Totem becomes a 2/2 white Spirit artifact creature with flying and first strike until end of turn.
 rarity=U
 [/card]
-
+[card]
+id=116736
+name=Tivadar of Thorn
+mana={1}{W}{W}
+type=Creature
+subtype=Human Knight
+text=First strike, protection from red When Tivadar of Thorn comes into play, destroy target Goblin.
+#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
+abilities=first strike, protection from red, legendary
+target=goblin
+auto=destroy
+power=2
+toughness=2
+rarity=R
+[/card]
 [card]
 id=108857
 name=Traitor's Clutch
diff --git a/projects/mtg/bin/Res/sets/USG/_cards.dat b/projects/mtg/bin/Res/sets/USG/_cards.dat
index cdb3ee26b..f18aa705e 100644
--- a/projects/mtg/bin/Res/sets/USG/_cards.dat
+++ b/projects/mtg/bin/Res/sets/USG/_cards.dat
@@ -336,21 +336,7 @@ rarity=U
 mana={2}{G}
 type=Enchantment
 [/card]
-[card]
-text=Flying. When Dark Hatchling comes into play, destroy target nonblack creature. It can't be regenerated.
-target=creature[-black]
-auto=bury
-id=5852
-name=Dark Hatchling
-color=Black
-rarity=R
-mana={4}{B}{B}
-type=Creature
-subtype=Horror
-power=3
-toughness=3
-abilities=flying
-[/card]
+
 [card]
 text=Add {B}{B}{B} to your mana pool.
 auto=Add {B}{B}{B}
@@ -745,33 +731,8 @@ power=0
 toughness=6
 abilities=defender
 [/card]
-[card]
-text=When Monk Idealist comes into play, return target enchantment card from your graveyard to your hand.
-target=enchantment|mygraveyard
-auto=moveTo(myhand)
-id=5706
-name=Monk Idealist
-rarity=U
-mana={2}{W}
-type=Creature
-subtype=Human Monk Cleric
-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
@@ -1146,19 +1107,7 @@ rarity=U
 type=Sorcery
 mana={2}{R}
 [/card]
-[card]
-text=When Stern Proctor enters the battlefield, return target artifact or enchantment to its owner's hand.
-target=enchantment,artifact
-auto=moveTo(ownerhand)
-id=5661
-name=Stern Proctor
-rarity=U
-mana={U}{U}
-type=Creature
-subtype=Human Wizard
-power=1
-toughness=2
-[/card]
+
 [card]
 text=Target player draws X cards.
 target=player
diff --git a/projects/mtg/bin/Res/sets/USG/todo.dat b/projects/mtg/bin/Res/sets/USG/todo.dat
index f04153f12..069596312 100644
--- a/projects/mtg/bin/Res/sets/USG/todo.dat
+++ b/projects/mtg/bin/Res/sets/USG/todo.dat
@@ -311,7 +311,22 @@ rarity=C
 type=Instant
 mana={U}
 [/card]
-
+[card]
+text=Flying. When Dark Hatchling comes into play, destroy target nonblack creature. It can't be regenerated.
+#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
+target=creature[-black]
+auto=bury
+id=5852
+name=Dark Hatchling
+color=Black
+rarity=R
+mana={4}{B}{B}
+type=Creature
+subtype=Horror
+power=3
+toughness=3
+abilities=flying
+[/card]
 [card]
 text=All creatures are black.
 id=5622
@@ -960,7 +975,35 @@ rarity=R
 type=Artifact
 mana={5}
 [/card]
-
+[card]
+text=When Monk Idealist comes into play, return target enchantment card from your graveyard to your hand.
+#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
+target=enchantment|mygraveyard
+auto=moveTo(myhand)
+id=5706
+name=Monk Idealist
+rarity=U
+mana={2}{W}
+type=Creature
+subtype=Human Monk Cleric
+power=2
+toughness=2
+[/card]
+[card]
+text=When Monk Realist comes into play, destroy target enchantment.
+#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
+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=Sacrifice No Rest for the Wicked: Return to your hand all creature cards that were put into your graveyard from play this turn.
@@ -1642,7 +1685,20 @@ type=Enchantment
 mana={G}
 subtype=Aura
 [/card]
-
+[card]
+text=When Stern Proctor enters the battlefield, return target artifact or enchantment to its owner's hand.
+target=enchantment,artifact
+#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
+auto=moveTo(ownerhand)
+id=5661
+name=Stern Proctor
+rarity=U
+mana={U}{U}
+type=Creature
+subtype=Human Wizard
+power=1
+toughness=2
+[/card]
 [card]
 text=If a red spell would deal damage to a creature or player, it deals that much damage plus 1 to that creature or player instead.
 id=5638
diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index e43b5dcbf..5f1fd0d0f 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -25,8 +25,8 @@ generic/wither.txt
 ########################
 #Specific Cards
 ########################
+act_of_treason.txt
 afflict.txt
-angel_of_despair.txt
 akron_legionnaire.txt
 Amugaba.txt
 anarchy.txt
@@ -93,6 +93,7 @@ drift_of_the_dead.txt
 dross_harvester.txt
 elvish_piper.txt
 elvish_promenade.txt
+emblem_of_the_warmind.txt
 farhaven_elf.txt
 fastbond.txt
 fastbond2.txt
@@ -139,7 +140,6 @@ lhurgoyf.txt
 liability.txt
 lifeforce.txt
 living_lands.txt
-looming_hoverguard.txt
 lord_of_the_pit.txt
 lord_of_the_pit2.txt
 master_of_etherium.txt
@@ -156,7 +156,6 @@ nightmare.txt
 northern_paladin.txt
 northern_paladin2.txt
 Nyxathid.txt
-ogre_gatecrasher.txt
 orcish_artillery.txt
 orcish_lumberjack.txt
 overrun.txt
@@ -213,7 +212,6 @@ terror.txt
 terror2.txt
 titanic_ultimatum.txt
 tranquil_domain.txt
-viridian_shaman.txt
 volcanic_island.txt
 unstable_mutation.txt
 wall_of_diffusion.txt
diff --git a/projects/mtg/bin/Res/test/act_of_treason.txt b/projects/mtg/bin/Res/test/act_of_treason.txt
new file mode 100644
index 000000000..827c33ce1
--- /dev/null
+++ b/projects/mtg/bin/Res/test/act_of_treason.txt
@@ -0,0 +1,42 @@
+#Bug: Act of Treason doesn't untap
+[INIT]
+COMBATATTACKERS
+[PLAYER1]
+inplay:grizzly bears
+[PLAYER2]
+hand:act of treason
+inplay:mountain,plains,swamp
+[DO]
+grizzly bears
+eot
+next
+#upkeep
+next
+#draw
+next
+#firstmain
+mountain
+plains
+swamp
+act of treason
+grizzly bears
+next
+#begin
+next
+#attackers
+grizzly bears
+next
+#blockers
+next
+#damage
+next
+#end combat
+[ASSERT]
+COMBATEND
+[PLAYER1]
+life:18
+[PLAYER2]
+inplay:mountain,plains,swamp,grizzly bears
+graveyard:act of treason
+life:18
+[END]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/test/emblem_of_the_warmind.txt b/projects/mtg/bin/Res/test/emblem_of_the_warmind.txt
new file mode 100644
index 000000000..986dfc871
--- /dev/null
+++ b/projects/mtg/bin/Res/test/emblem_of_the_warmind.txt
@@ -0,0 +1,23 @@
+#Bug: Emblem of the warmind doesn't go to graveyard
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:grizzly bears,plains,swamp,forest,mountain
+hand:emblem of the warmind,terror
+[PLAYER2]
+[DO]
+forest
+mountain
+emblem of the warmind
+grizzly bears
+plains
+swamp
+terror
+grizzly bears
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+inplay:plains,swamp,forest,mountain
+graveyard:emblem of the warmind,terror,grizzly bears
+[PLAYER2]
+[END]
\ No newline at end of file
diff --git a/projects/mtg/src/GameObserver.cpp b/projects/mtg/src/GameObserver.cpp
index 0dd0edd34..9ee6cf3e3 100644
--- a/projects/mtg/src/GameObserver.cpp
+++ b/projects/mtg/src/GameObserver.cpp
@@ -286,6 +286,11 @@ void GameObserver::stateEffects()
     for (int j = zone->nb_cards-1 ; j>=0; j--){
       MTGCardInstance * card = zone->cards[j];
       card->afterDamage();
+
+      //Remove auras that don't have a valid target anymore
+      if (card->target && !isInPlay(card->target)){
+        players[i]->game->putInGraveyard(card);
+      }
     }
   }
   for (int i =0; i < 2; i++)
diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp
index 9a009d606..82c036276 100644
--- a/projects/mtg/src/MTGAbility.cpp
+++ b/projects/mtg/src/MTGAbility.cpp
@@ -1710,11 +1710,7 @@ int MTGAbility::testDestroy(){
   if (forceDestroy == 1) return 1;
   if (forceDestroy == -1) return 0;
   if (!game->isInPlay(source) ) return 1;
-
-  if (target && !game->isInPlay((MTGCardInstance *)target)){
-    source->controller()->game->putInGraveyard(source);//TODO put this in a better place ???
-    return 1;
-  }
+  if (target && !game->isInPlay((MTGCardInstance *)target)) return 1;
   return 0;
 }
 
diff --git a/projects/mtg/src/TestSuiteAI.cpp b/projects/mtg/src/TestSuiteAI.cpp
index 25e155673..28afde261 100644
--- a/projects/mtg/src/TestSuiteAI.cpp
+++ b/projects/mtg/src/TestSuiteAI.cpp
@@ -75,7 +75,7 @@ int TestSuiteAI::Act(float dt){
   }
 
   
-  timer+= dt;
+  timer+= 1;
   if (timer < suite->timerLimit) return 1;
   timer = 0;
 
@@ -271,11 +271,11 @@ void TestSuite::initGame(){
   //The first test runs slowly, the other ones run faster.
   //This way a human can see what happens when testing a specific file,
   // or go faster when it comes to the whole test suite.
-  //Warning, putting this value too low (< 0.25) will give unexpected results
+  //Warning, putting this value too low (< 3) will give unexpected results
   if (!timerLimit){
-    timerLimit = 0.5;
+    timerLimit = 40;
   }else{
-    timerLimit = 0.1;
+    timerLimit = 3;
   }
   //Put the GameObserver in the initial state
   GameObserver * g = GameObserver::GetInstance();