diff --git a/projects/mtg/bin/Res/sets/10E/_cards.dat b/projects/mtg/bin/Res/sets/10E/_cards.dat
index 1d0e8bcd9..046622581 100644
--- a/projects/mtg/bin/Res/sets/10E/_cards.dat
+++ b/projects/mtg/bin/Res/sets/10E/_cards.dat
@@ -848,6 +848,19 @@ subtype=Demon
 toughness=7
 [/card]
 [card]
+text={W}, {T}: Tap target creature.
+auto={W},{T}:tap target(creature)
+id=129638
+name=Loxodon Mystic
+rarity=C
+color=White
+type=Creature
+mana={3}{W}{W}
+power=3
+subtype=Elephant Cleric
+toughness=3
+[/card]
+[card]
 text=
 id=129631
 name=Lumengrid Warden
@@ -1076,6 +1089,19 @@ subtype=Horror
 toughness=2
 [/card]
 [card]
+text=Shroud (This creature can't be the target of spells or abilities.)
+abilities=shroud
+id=130526
+name=Pincher Beetles
+rarity=C
+color=Green
+type=Creature
+mana={2}{G}
+power=3
+subtype=Insect
+toughness=1
+[/card]
+[card]
 text=Swampwalk (This creature is unblockable as long as defending player controls a Swamp.)
 abilities=swampwalk
 id=129678
@@ -1089,6 +1115,16 @@ subtype=Insect
 toughness=1
 [/card]
 [card]
+text=Destroy all creatures you don't control. They can't be regenerated.
+auto=bury all(creature|opponentinplay)
+id=129679
+name=Plague Wind
+rarity=R
+color=Black
+type=Sorcery
+mana={7}{B}{B}
+[/card]
+[card]
 text={T}: Add {W} to your mana pool.
 auto={T}: Add {W}
 id=129682
@@ -1237,6 +1273,18 @@ type=Instant
 mana={W}
 [/card]
 [card]
+text=Enchant creature (Target a creature as you play this. This card comes into play attached to that creature.)  Enchanted creature has shroud. (It can't be the target of spells or abilities.)
+target=creature
+auto=shroud
+id=134764
+name=Robe of Mirrors
+rarity=C
+color=Blue
+type=Enchantment
+mana={U}
+subtype=Aura
+[/card]
+[card]
 text=Mountainwalk (This creature is unblockable as long as defending player controls a Mountain.)
 abilities=mountainwalk
 id=129715
diff --git a/projects/mtg/bin/Res/sets/10E/todo.dat b/projects/mtg/bin/Res/sets/10E/todo.dat
index 07f7dc75b..76cbb70e6 100644
--- a/projects/mtg/bin/Res/sets/10E/todo.dat
+++ b/projects/mtg/bin/Res/sets/10E/todo.dat
@@ -733,6 +733,7 @@ type=Land
 [/card]
 [card]
 text={2}, {T}: You gain 1 life.
+aut={2},{T}:life:+1
 id=135273
 name=Fountain of Youth
 rarity=U
@@ -1085,18 +1086,6 @@ subtype=Zombie
 toughness=2
 [/card]
 [card]
-text={W}, {T}: Tap target creature.
-id=129638
-name=Loxodon Mystic
-rarity=C
-color=White
-type=Creature
-mana={3}{W}{W}
-power=3
-subtype=Elephant Cleric
-toughness=3
-[/card]
-[card]
 text=Equipped creature gets +3/+0 and has lifelink and trample. (When it deals damage, you gain that much life. If it would deal enough combat damage to its blockers to destroy them, you may have it deal the rest of its damage to defending player.)  Equip {3} ({3}: Attach to target creature you control. Equip only as a sorcery.)
 id=129630
 name=Loxodon Warhammer
@@ -1402,18 +1391,6 @@ type=Artifact
 mana={3}
 [/card]
 [card]
-text=Shroud (This creature can't be the target of spells or abilities.)
-id=130526
-name=Pincher Beetles
-rarity=C
-color=Green
-type=Creature
-mana={2}{G}
-power=3
-subtype=Insect
-toughness=1
-[/card]
-[card]
 text=As Pithing Needle comes into play, name a card.     Activated abilities of sources with the chosen name can't be played unless they're mana abilities.
 id=129526
 name=Pithing Needle
@@ -1432,15 +1409,6 @@ type=Instant
 mana={3}{U}
 [/card]
 [card]
-text=Destroy all creatures you don't control. They can't be regenerated.
-id=129679
-name=Plague Wind
-rarity=R
-color=Black
-type=Sorcery
-mana={7}{B}{B}
-[/card]
-[card]
 text=Flying (This creature can't be blocked except by creatures with flying or reach.)  You can't lose the game and your opponents can't win the game.
 id=106537
 name=Platinum Angel
@@ -1596,16 +1564,6 @@ subtype=Rhino Beast
 toughness=5
 [/card]
 [card]
-text=Enchant creature (Target a creature as you play this. This card comes into play attached to that creature.)  Enchanted creature has shroud. (It can't be the target of spells or abilities.)
-id=134764
-name=Robe of Mirrors
-rarity=C
-color=Blue
-type=Enchantment
-mana={U}
-subtype=Aura
-[/card]
-[card]
 text=Artifacts and lands come into play tapped.
 id=135251
 name=Root Maze
diff --git a/projects/mtg/bin/Res/sets/ICE/_cards.dat b/projects/mtg/bin/Res/sets/ICE/_cards.dat
index 871811cf1..1c0d3fe00 100644
--- a/projects/mtg/bin/Res/sets/ICE/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ICE/_cards.dat
@@ -576,18 +576,6 @@ subtype=Strider
 toughness=5
 [/card]
 [card]
-text={0}: Flying and -1/-0 until end of turn
-id=2457
-name=Hyalopterous Lemure
-auto={0}:flying,-1/0
-rarity=U
-type=Creature 
-mana={4}{B}
-power=4
-subtype=Lemure
-toughness=3
-[/card]
-[card]
 text={G}: Regenerate
 id=2598
 abilities=defender
@@ -943,7 +931,8 @@ toughness=7
 [card]
 text=Counts as a wall {3}: Walking Wall gets +3/-1 until end of turn and can attack this turn. Walking Wall cannot attack the turn it comes under your control. Use this ability only once a turn.
 id=2432
-auto={3}:3/1 limit 1
+abilities=Defender
+auto={3}:+3/-1 limit 1
 name=Walking Wall
 rarity=U
 type=Artifact Creature
@@ -1036,7 +1025,7 @@ rarity=C
 type=Creature 
 mana={1}{B}{B}
 power=2
-subtype=Zombies
+subtype=zombie
 toughness=3
 [/card]
 [card]
@@ -1323,7 +1312,7 @@ id=2491
 name=Touch of Death
 target=player
 auto=damage:1
-auto=draw:1
+auto=@next upkeep:draw:1
 auto=gainlife:1
 rarity=C
 type=Sorcery
diff --git a/projects/mtg/bin/Res/sets/ICE/todo.dat b/projects/mtg/bin/Res/sets/ICE/todo.dat
index 7c74f7974..664865b6d 100644
--- a/projects/mtg/bin/Res/sets/ICE/todo.dat
+++ b/projects/mtg/bin/Res/sets/ICE/todo.dat
@@ -439,6 +439,18 @@ type=Enchantment
 mana={1}{B}{B}
 [/card]
 [card]
+text={0}: Flying and -1/-0 until end of turn
+id=2457
+name=Hyalopterous Lemure
+auto={0}:flying,-1/0
+rarity=U
+type=Creature 
+mana={4}{B}
+power=4
+subtype=Lemure
+toughness=3
+[/card]
+[card]
 text=When Iceberg comes into play, put X ice counters on it.{3}: Put an ice counter on Iceberg. {0}: Remove an ice counter from Iceberg to add one colorless mana to your mana pool. Play this ability as an interrupt.
 id=2509
 name=Iceberg
diff --git a/projects/mtg/src/TargetChooser.cpp b/projects/mtg/src/TargetChooser.cpp
index 7a39197c2..403bcdacd 100644
--- a/projects/mtg/src/TargetChooser.cpp
+++ b/projects/mtg/src/TargetChooser.cpp
@@ -281,10 +281,11 @@ TargetChooser::TargetChooser(MTGCardInstance * card, int _maxtargets): TargetsLi
 }
 
 //Default targetter : every card can be targetted, unless it is protected from the source card
+// For spells that do not "target" a specific card, set source to NULL
 int TargetChooser::canTarget(Targetable * target){
   if (target->typeAsTarget() == TARGET_CARD){
     MTGCardInstance * card = (MTGCardInstance *) target;
-    if (source && card->protectedAgainst(source)) return 0;
+    if (source && (card->protectedAgainst(source) || card->has(SHROUD))) return 0;
     return 1;
   }
   return 0;