diff --git a/projects/mtg/bin/Res/sets/ARB/_cards.dat b/projects/mtg/bin/Res/sets/ARB/_cards.dat
index 643eae26a..55f6d2672 100644
--- a/projects/mtg/bin/Res/sets/ARB/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ARB/_cards.dat
@@ -404,6 +404,18 @@ rarity=U
 mana={2}{W}{U}
 auto={T}:Untap target(other *)
 type=Artifact
+[/card]¨
+[card]
+id=180619
+name=Vedalken Heretic
+mana={G}{U}
+type=Creature
+subtype=Vedalken Rogue
+power=1
+toughness=1
+text=Whenever Vedalken Heretic deals damage to an opponent, you may draw a card.
+auto=@damaged(player) from(this):may draw:1 controller
+rarity=R
 [/card]
 [card]
 text=Defender, flying, shroud
diff --git a/projects/mtg/bin/Res/sets/ARB/todo.dat b/projects/mtg/bin/Res/sets/ARB/todo.dat
index 90301eb54..949246f5f 100644
--- a/projects/mtg/bin/Res/sets/ARB/todo.dat
+++ b/projects/mtg/bin/Res/sets/ARB/todo.dat
@@ -1014,17 +1014,6 @@ text=Whenever Vedalken Ghoul becomes blocked, defending player loses 4 life.
 rarity=C
 [/card]
 [card]
-id=180619
-name=Vedalken Heretic
-mana={G}{U}
-type=Creature
-subtype=Vedalken Rogue
-power=1
-toughness=1
-text=Whenever Vedalken Heretic deals damage to an opponent, you may draw a card.
-rarity=R
-[/card]
-[card]
 id=189640
 name=Veinfire Borderpost
 mana={1}{B}{R}
diff --git a/projects/mtg/bin/Res/sets/MOR/_cards.dat b/projects/mtg/bin/Res/sets/MOR/_cards.dat
index f6df37c7a..5771e9fdf 100644
--- a/projects/mtg/bin/Res/sets/MOR/_cards.dat
+++ b/projects/mtg/bin/Res/sets/MOR/_cards.dat
@@ -110,6 +110,7 @@ id=152938
 name=Idyllic Tutor
 rarity=R
 mana={2}{W}
+target=enchantment|myLibrary
 auto=moveTo(myhand) target(enchantment|myLibrary)
 type=Sorcery
 [/card]
diff --git a/projects/mtg/bin/Res/sets/ODY/_cards.dat b/projects/mtg/bin/Res/sets/ODY/_cards.dat
index 20ea6b044..5e20eb856 100644
--- a/projects/mtg/bin/Res/sets/ODY/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ODY/_cards.dat
@@ -1203,6 +1203,18 @@ rarity=R
 type=Land
 [/card]
 [card]
+text=Fear (This creature can't be blocked except by artifact creatures and/or black creatures.) Whenever Shadowmage Infiltrator deals combat damage to a player, you may draw a card.
+id=33604
+auto=@damaged(player) from(this):may draw:1 controller
+name=Shadowmage Infiltrator
+rarity=R
+type=Creature
+mana={1}{U}{B}
+power=1
+subtype=Human Wizard
+toughness=3
+[/card]
+[card]
 text={2}, {T}, Sacrifice Skycloud Egg: Add {W}{U} to your mana pool. Draw a card.
 auto={2}{T}{S}:Add {W}{U} && draw:1
 id=29892
@@ -1246,6 +1258,18 @@ toughness=1
 abilities=flying
 [/card]
 [card]
+text=Whenever Spark Mage deals combat damage to a player, you may have Spark Mage deal 1 damage to target creature that player controls.
+id=29854
+name=Spark Mage
+auto=@damaged(player) from(this):may damage:1 target(creature|opponentBattlefield)
+rarity=U
+type=Creature
+mana={R}
+power=1
+subtype=Dwarf Wizard
+toughness=1
+[/card]
+[card]
 text=Until end of turn, whenever target creature deals damage, you gain that much life. Draw a card. 
 id=29807
 name=Spiritualize
@@ -1485,6 +1509,18 @@ mana={1}{U}
 type=Instant
 [/card]
 [card]
+text=Whenever Zombie Cannibal deals combat damage to a player, you may remove target card in that player's graveyard from the game.
+id=29735
+name=Zombie Cannibal
+auto=@damaged(player) from(this):may moveto(exile) target(*|opponentgraveyard)
+rarity=C
+type=Creature
+mana={B}
+power=1
+subtype=Zombie
+toughness=1
+[/card]
+[card]
 text=Return target creature card from your graveyard to the battlefield.
 id=29847
 name=Zombify
diff --git a/projects/mtg/bin/Res/sets/ODY/todo.dat b/projects/mtg/bin/Res/sets/ODY/todo.dat
index 7aef72758..4974ee803 100644
--- a/projects/mtg/bin/Res/sets/ODY/todo.dat
+++ b/projects/mtg/bin/Res/sets/ODY/todo.dat
@@ -18,7 +18,6 @@ type=Enchantment
 mana={U}
 subtype=Aura
 [/card]
-
 [card]
 text={1}: The next time an instant or sorcery spell would deal damage to you this turn, that spell deals that damage to its controller instead.
 id=29922
@@ -1563,17 +1562,6 @@ mana={2}{G}
 subtype=Aura
 [/card]
 [card]
-text=Fear     Whenever Shadowmage Infiltrator deals combat damage to a player, you may draw a card.
-id=33604
-name=Shadowmage Infiltrator
-rarity=R
-type=Creature
-mana={1}{U}{B}
-power=1
-subtype=Human Wizard
-toughness=3
-[/card]
-[card]
 text=Target creature you control gains protection from the color of your choice until end of turn.       Draw a card.
 id=30761
 name=Shelter
@@ -1624,18 +1612,6 @@ rarity=U
 type=Sorcery
 mana={B}
 [/card]
-
-[card]
-text=Whenever Spark Mage deals combat damage to a player, you may have Spark Mage deal 1 damage to target creature that player controls.
-id=29854
-name=Spark Mage
-rarity=U
-type=Creature
-mana={R}
-power=1
-subtype=Dwarf Wizard
-toughness=1
-[/card]
 [card]
 text=Creatures you control can't be the targets of blue spells or abilities from blue sources.
 id=31800
@@ -1988,17 +1964,6 @@ subtype=Zombie Assassin
 toughness=2
 [/card]
 [card]
-text=Whenever Zombie Cannibal deals combat damage to a player, you may remove target card in that player's graveyard from the game.
-id=29735
-name=Zombie Cannibal
-rarity=C
-type=Creature
-mana={B}
-power=1
-subtype=Zombie
-toughness=1
-[/card]
-[card]
 text=Discard two cards: Put a 2/2 black Zombie creature token into play.
 id=29957
 name=Zombie Infestation
diff --git a/projects/mtg/bin/Res/sets/RV/_cards.dat b/projects/mtg/bin/Res/sets/RV/_cards.dat
index 6eba30c02..c5eba6ba0 100644
--- a/projects/mtg/bin/Res/sets/RV/_cards.dat
+++ b/projects/mtg/bin/Res/sets/RV/_cards.dat
@@ -864,6 +864,18 @@ power=0
 toughness=1
 [/card]
 [card]
+text=Whenever Fungusaur is dealt damage, put a +1/+1 counter on it.
+id=1246
+name=Fungusaur
+auto=@damaged(this):counter(1/1,1)
+rarity=R
+type=Creature
+mana={3}{G}
+power=2
+subtype=Fungusaur
+toughness=2
+[/card
+[card]
 text=Target creature gets +3/+3 until end of turn.
 target=creature
 auto=3/3
diff --git a/projects/mtg/bin/Res/sets/RV/todo.dat b/projects/mtg/bin/Res/sets/RV/todo.dat
index 0cdfe1a5a..b17ba70ab 100644
--- a/projects/mtg/bin/Res/sets/RV/todo.dat
+++ b/projects/mtg/bin/Res/sets/RV/todo.dat
@@ -144,22 +144,6 @@ type=Instant
 mana={R}{R}
 [/card]
 [card]
-text=Whenever Fungusaur is dealt damage, put a +1/+1 counter on it.
-id=1246
-name=Fungusaur
-#Don't work should work: since Dromad Purebred (RAV) works fine this one should work fine too... it work if the creature has first strike if you or you opponent cast a damage spell on fungusaur but not if is damage made by normal attacking or defending creature... make no sens
-auto=@damaged(this) from(*|myBattlefield):counter(1/1,1)
-auto=@damaged(this) from(*|opponentBattlefield):counter(1/1,1)
-auto=@damaged(this) from(*|mystack):counter(1/1,1)
-auto=@damaged(this) from(*|opponentstack):counter(1/1,1)
-rarity=R
-type=Creature
-mana={3}{G}
-power=2
-subtype=Fungusaur
-toughness=2
-[/card]
-[card]
 text=As long as Gaea's Liege isn't attacking, its power and toughness are each equal to the number of Forests you control. As long as Gaea's Liege is attacking, its power and toughness are each equal to the number of Forests defending player controls.     {T}: Target land becomes a Forest until Gaea's Liege leaves play.
 id=1247
 name=Gaea's Liege