diff --git a/projects/mtg/bin/Res/sets/DIS/_cards.dat b/projects/mtg/bin/Res/sets/DIS/_cards.dat
index e647850b4..dfe46690e 100644
--- a/projects/mtg/bin/Res/sets/DIS/_cards.dat
+++ b/projects/mtg/bin/Res/sets/DIS/_cards.dat
@@ -160,6 +160,18 @@ type=Land
 subtype=Plains Island
 [/card]
 [card]
+text=When Indrik Stomphowler enters the battlefield, destroy target artifact or enchantment.
+id=107377
+name=Indrik Stomphowler
+mana={4}{G}
+type=Creature
+subtype=Beast
+auto=destroy target(artifact,enchantment)
+power=4
+toughness=4
+rarity=U
+[/card]
+[card]
 text=Flying
 id=107260
 name=Mistral Charger
@@ -172,6 +184,18 @@ toughness=1
 abilities=flying
 [/card]
 [card]
+text=When Ogre Gatecrasher enters the battlefield, destroy target creature with defender.
+id=107389
+name=Ogre Gatecrasher
+auto=destroy target(creature[defender])
+rarity=C
+mana={3}{R}
+type=Creature
+subtype=Ogre Rogue
+power=3
+toughness=3
+[/card]
+[card]
 text=Whenever Paladin of Prahv deals damage, you gain that much life.   Forecast - {1}{W}, Reveal Paladin of Prahv from your hand: Whenever target creature deals damage this turn, you gain that much life. (Activate this ability only during your upkeep and only once each turn.)
 autohand={1}{W}:lifelink target(creature) limit:1 myUpkeepOnly
 id=107433
@@ -478,6 +502,18 @@ toughness=4
 abilities=defender,flying
 [/card]
 [card]
+text=When Whiptail Moloch enters the battlefield, it deals 3 damage to target creature you control.
+id=97075
+name=Whiptail Moloch
+rarity=C
+mana={4}{R}
+type=Creature
+subtype=Lizard
+auto=damage:3 target(creature|myBattlefield)
+power=6
+toughness=3
+[/card]
+[card]
 text=Destroy target creature or land.
 id=111202
 target=creature,land
diff --git a/projects/mtg/bin/Res/sets/DIS/todo.dat b/projects/mtg/bin/Res/sets/DIS/todo.dat
index cafac7103..5cfd609ab 100644
--- a/projects/mtg/bin/Res/sets/DIS/todo.dat
+++ b/projects/mtg/bin/Res/sets/DIS/todo.dat
@@ -165,7 +165,6 @@ type=Instant
 text=The next 1 damage that would be dealt to target creature this turn is dealt to another target creature instead. Draw a card.
 rarity=C
 [/card]
-
 [card]
 id=97106
 name=Coiling Oracle
@@ -280,7 +279,6 @@ type=Sorcery
 text=Demonfire deals X damage to target creature or player. If a creature dealt damage this way would be put into a graveyard this turn, exile it instead. Hellbent - If you have no cards in hand, Demonfire can't be countered by spells or abilities and the damage can't be prevented.
 rarity=R
 [/card]
-
 [card]
 id=107373
 name=Bound // Determined (Determined)
@@ -305,7 +303,6 @@ type=Enchantment
 text=({(w/u)} can be paid with either {W} or {U}.) Whenever a player casts a noncreature spell, counter that spell. That player puts X 1/1 white and blue Bird creature tokens with flying onto the battlefield, where X is the spell's converted mana cost.
 rarity=R
 [/card]
-
 [card]
 id=111258
 name=Drekavac
@@ -500,7 +497,6 @@ toughness=3
 text=Protection from monocolored
 rarity=C
 [/card]
-
 [card]
 id=107272
 name=Haazda Shield Mate
@@ -558,20 +554,6 @@ text=Exile all cards from your hand face down. At the beginning of the next end
 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
 mana={1}{B}
@@ -690,7 +672,6 @@ toughness=1
 text=({(w/u)} can be paid with either {W} or {U}.) {T}: Tap target creature.
 rarity=C
 [/card]
-
 [card]
 id=107506
 name=Momir Vig, Simic Visionary
@@ -771,20 +752,6 @@ 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
 mana={1}{G}{G}{U}
@@ -996,7 +963,6 @@ subtype=Equipment
 text=Equipped creature gets +1/+0 for each blood counter on Rakdos Riteknife and has "{T}, Sacrifice a creature: Put a blood counter on Rakdos Riteknife." {B}{R}, Sacrifice Rakdos Riteknife: Target player sacrifices a permanent for each blood counter on Rakdos Riteknife. Equip {2}
 rarity=R
 [/card]
-
 [card]
 id=107438
 name=Rakdos the Defiler
@@ -1008,7 +974,6 @@ toughness=6
 text=Flying, trample Whenever Rakdos the Defiler attacks, sacrifice half the non-Demon permanents you control, rounded up. Whenever Rakdos deals combat damage to a player, that player sacrifices half the non-Demon permanents he or she controls, rounded up.
 rarity=R
 [/card]
-
 [card]
 id=107375
 name=Research // Development (Research)
@@ -1017,7 +982,6 @@ type=Instant
 text=Choose up to four cards you own from outside the game and shuffle them into your library.
 rarity=R
 [/card]
-
 [card]
 id=107423
 name=Rise // Fall (Rise)
@@ -1053,8 +1017,6 @@ toughness=2
 text={R}, Sacrifice Sandstorm Eidolon: Target creature can't block this turn. Whenever you cast a multicolored spell, you may return Sandstorm Eidolon from your graveyard to your hand.
 rarity=C
 [/card]
-
-
 [card]
 id=107315
 name=Hide // Seek (Seek)
@@ -1063,8 +1025,6 @@ type=Instant
 text= Search target opponent's library for a card and exile it. You gain life equal to its converted mana cost. Then that player shuffles his or her library.
 rarity=R
 [/card]
-
-
 [card]
 id=107347
 name=Simic Basilisk
@@ -1307,7 +1267,6 @@ subtype=Aura
 text=Enchant Forest As Utopia Sprawl enters the battlefield, choose a color. Whenever enchanted Forest is tapped for mana, its controller adds one mana of the chosen color to his or her mana pool (in addition to the mana the land produces).
 rarity=C
 [/card]
-
 [card]
 id=107431
 name=Valor Made Real
@@ -1327,7 +1286,6 @@ toughness=2
 text={G}, Sacrifice Verdant Eidolon: Add three mana of any one color to your mana pool. Whenever you cast a multicolored spell, you may return Verdant Eidolon from your graveyard to your hand.
 rarity=C
 [/card]
-
 [card]
 id=107321
 name=Vigean Graftmage
@@ -1358,7 +1316,6 @@ type=Instant
 text=Choose a card type, then reveal the top four cards of your library. Put all cards of the chosen type revealed this way into your hand and the rest into your graveyard. (The card types are artifact, creature, enchantment, instant, land, planeswalker, sorcery, and tribal.)
 rarity=U
 [/card]
-
 [card]
 id=97096
 name=Voidslime
@@ -1367,7 +1324,6 @@ type=Instant
 text=Counter target spell, activated ability, or triggered ability. (Mana abilities can't be targeted.)
 rarity=R
 [/card]
-
 [card]
 id=97092
 name=Walking Archive
@@ -1396,20 +1352,6 @@ text=Weight of Spires deals damage to target creature equal to the number of non
 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
 mana={3}{W}{U}
@@ -1428,7 +1370,6 @@ type=Sorcery
 text=Target player discards his or her hand.
 rarity=R
 [/card]
-
 [card]
 id=107413
 name=Writ of Passage
diff --git a/projects/mtg/bin/Res/sets/EVE/_cards.dat b/projects/mtg/bin/Res/sets/EVE/_cards.dat
index 889ad049c..7d7efd19d 100644
--- a/projects/mtg/bin/Res/sets/EVE/_cards.dat
+++ b/projects/mtg/bin/Res/sets/EVE/_cards.dat
@@ -459,6 +459,18 @@ toughness=3
 abilities=defender,flying
 [/card]
 [card]
+text=When Marshdrinker Giant enters the battlefield, destroy target Island or Swamp an opponent controls.
+auto=destroy target(island,swamp|opponentBattlefield)
+id=142015
+name=Marshdrinker Giant
+rarity=U
+mana={3}{G}{G}
+type=Creature
+subtype=Giant Warrior
+power=4
+toughness=3
+[/card]
+[card]
 text={T}: Target creature gains flying until end of turn.   Whenever you cast a blue spell, you may untap Merrow Levitator.
 id=151088
 name=Merrow Levitator
@@ -561,6 +573,18 @@ power=2
 toughness=2
 [/card]
 [card]
+text=When Noggle Bridgebreaker enters the battlefield, return a land you control to its owner's hand.
+id=158899
+name=Noggle Bridgebreaker
+auto=moveTo(ownerhand) target(land|myBattlefield)
+rarity=C
+mana={2}{UR}{UR}
+type=Creature
+subtype=Noggle Rogue
+power=4
+toughness=3
+[/card]
+[card]
 text=When Noggle Ransacker enters the battlefield, each player draws two cards, then discards a card at random.
 id=152032
 auto=draw:2 controller
diff --git a/projects/mtg/bin/Res/sets/EVE/todo.dat b/projects/mtg/bin/Res/sets/EVE/todo.dat
index 9077a0576..5cb59c673 100644
--- a/projects/mtg/bin/Res/sets/EVE/todo.dat
+++ b/projects/mtg/bin/Res/sets/EVE/todo.dat
@@ -533,7 +533,6 @@ rarity=U
 type=Instant
 mana={3}{GU}
 [/card]
-
 [card]
 text=Chroma - Each creature you control gets +1/+1 for each white mana symbol in its mana cost.
 id=151139
@@ -543,20 +542,6 @@ 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
 name=Merrow Bonegnawer
@@ -628,20 +613,6 @@ subtype=Shapeshifter
 toughness=1
 [/card]
 [card]
-###Creatures with Comes-into-play-effect needing a target not supported yet! 0.10.1
-text=When Noggle Bridgebreaker enters the battlefield, return a land you control to its owner's hand.
-id=158899
-name=Noggle Bridgebreaker
-target=land|myBattlefield
-auto=moveTo(ownerhand)
-rarity=C
-mana={2}{UR}{UR}
-type=Creature
-subtype=Noggle Rogue
-power=4
-toughness=3
-[/card]
-[card]
 text=When Noggle Hedge-Mage comes into play, if you control two or more Islands, you may tap two target permanents.     When Noggle Hedge-Mage comes into play, if you control two or more Mountains, you may have Noggle Hedge-Mage deal 2 damage to target player.
 id=159066
 name=Noggle Hedge-Mage