diff --git a/projects/mtg/bin/Res/sets/10E/_cards.dat b/projects/mtg/bin/Res/sets/10E/_cards.dat
index 93490485c..38856d57f 100644
--- a/projects/mtg/bin/Res/sets/10E/_cards.dat
+++ b/projects/mtg/bin/Res/sets/10E/_cards.dat
@@ -539,10 +539,11 @@ text=Enchant creature (Target a creature as you play this. This card comes into
 id=129521
 target=creature
 name=Dehydration
-rarity=C
+auto=doesnotuntap
 type=Enchantment
 mana={3}{U}
 subtype=Aura
+rarity=C
 [/card]
 [card]
 text=Tap all creatures without flying.
@@ -818,15 +819,6 @@ type=Instant
 mana={1}{R}
 [/card]
 [card]
-text={T}: Add {G} to your mana pool.
-auto={T}: Add {G}
-id=129562
-name=Forest
-rarity=L
-type=Basic Land
-subtype=Forest
-[/card]
-[card]
 text={7}{R}: Flamewave Invoker deals 5 damage to target player.
 id=130378
 auto={7}{R}:Damage:5 target(player)
@@ -860,7 +852,7 @@ auto=lord(creature) x/-x
 [card]
 text={T}: Add {G} to your mana pool.
 auto={T}: Add {G}
-id=129561
+id=129559
 name=Forest
 rarity=L
 type=Basic Land
@@ -878,7 +870,16 @@ subtype=Forest
 [card]
 text={T}: Add {G} to your mana pool.
 auto={T}: Add {G}
-id=129559
+id=129561
+name=Forest
+rarity=L
+type=Basic Land
+subtype=Forest
+[/card]
+[card]
+text={T}: Add {G} to your mana pool.
+auto={T}: Add {G}
+id=129562
 name=Forest
 rarity=L
 type=Basic Land
diff --git a/projects/mtg/bin/Res/sets/INV/todo.dat b/projects/mtg/bin/Res/sets/INV/todo.dat
index 129bb0eef..c16cf1589 100644
--- a/projects/mtg/bin/Res/sets/INV/todo.dat
+++ b/projects/mtg/bin/Res/sets/INV/todo.dat
@@ -1629,12 +1629,18 @@ mana={2}{R}
 text=Kicker {X} (You may pay an additional {X} as you play this spell.)  Other Treefolk creatures and Saproling creatures get +1/+1.     When Verdeloth the Ancient comes into play, if the kicker cost was paid, put X 1/1 green Saproling creature tokens into play.
 id=23137
 name=Verdeloth the Ancient
-rarity=R
-type=Legendary Creature
 mana={4}{G}{G}
+kicker={X}
+type=Creature
+abilities=legendary
+auto=lord(treefolk) 1/1 other
+auto=lord(saproling) 1/1 other
+auto=kicker token(saproling,creature saproling,1/1,green)*x
+##doesn't yet work
 power=4
 subtype=Treefolk
 toughness=7
+rarity=R
 [/card]
 [card]
 text=Kicker {1}{R} (You may pay an additional {1}{R} as you play this spell.)  When Verduran Emissary comes into play, if the kicker cost was paid, destroy target artifact. It can't be regenerated.
diff --git a/projects/mtg/bin/Res/sets/M10/_cards.dat b/projects/mtg/bin/Res/sets/M10/_cards.dat
index a0b31e267..7074ebf74 100644
--- a/projects/mtg/bin/Res/sets/M10/_cards.dat
+++ b/projects/mtg/bin/Res/sets/M10/_cards.dat
@@ -561,7 +561,7 @@ mana={3}{G}
 type=Enchantment
 subtype=Aura
 text=Enchant tapped creature Enchanted creature doesn't untap during its controller's untap step.
-target=creature
+target=creature[tapped]
 auto=doesnotuntap
 rarity=C
 [/card]
diff --git a/projects/mtg/bin/Res/sets/MIR/todo.dat b/projects/mtg/bin/Res/sets/MIR/todo.dat
index 590e7ee87..2e6838a1d 100644
--- a/projects/mtg/bin/Res/sets/MIR/todo.dat
+++ b/projects/mtg/bin/Res/sets/MIR/todo.dat
@@ -32,6 +32,7 @@ name=Afterlife
 target=creature
 auto=bury
 auto=token(Spirit,creature spirit,1/1,flying white) targetcontroller
+## token doesn't work with "targetcontroller"
 type=Instant
 mana={2}{W}
 rarity=U
@@ -530,17 +531,7 @@ subtype=Human Soldier
 toughness=1
 [/card]
 
-[card]
-text={T}: Target creature with power 2 or less is unblockable this turn.
-id=3441
-name=Dwarven Nomad
-rarity=C
-type=Creature
-mana={2}{R}
-power=1
-subtype=Dwarf Nomad
-toughness=1
-[/card]
+
 [card]
 text=Target player untaps all basic lands he or she controls.
 id=3382
diff --git a/projects/mtg/bin/Res/sets/MRQ/_cards.dat b/projects/mtg/bin/Res/sets/MRQ/_cards.dat
index 660fc920d..f4e5fa78f 100644
--- a/projects/mtg/bin/Res/sets/MRQ/_cards.dat
+++ b/projects/mtg/bin/Res/sets/MRQ/_cards.dat
@@ -296,6 +296,17 @@ power=1
 toughness=1
 [/card]
 [card]
+text=Enchant creature (Target a creature as you play this. This card comes into play attached to that creature.)  Enchanted creature doesn't untap during its controller's untap step.
+id=19577
+name=Dehydration
+target=creature
+auto=doesnotuntap
+type=Enchantment
+mana={3}{U}
+subtype=Aura
+rarity=C
+[/card]
+[card]
 text=Destroy target permanent.
 id=19638
 target=*
diff --git a/projects/mtg/bin/Res/sets/MRQ/todo.dat b/projects/mtg/bin/Res/sets/MRQ/todo.dat
index ceb668e7d..9011df932 100644
--- a/projects/mtg/bin/Res/sets/MRQ/todo.dat
+++ b/projects/mtg/bin/Res/sets/MRQ/todo.dat
@@ -13,9 +13,12 @@ toughness=3
 text=Destroy target creature. It can't be regenerated. Its controller puts a 1/1 white Spirit creature token with flying into play.
 id=19549
 name=Afterlife
-rarity=U
+target=creature
+auto=bury && token(Spirit,creature,1/1,flying white)
+## token doesn't work with "targetcontroller"
 type=Instant
 mana={2}{W}
+rarity=U
 [/card]
 [card]
 text=Defender (This creature can't attack.)  {T}: Prevent the next 1 damage that would be dealt to target creature or player this turn.
@@ -573,15 +576,7 @@ power=1
 subtype=Wolverine
 toughness=1
 [/card]
-[card]
-text=Enchant creature (Target a creature as you play this. This card comes into play attached to that creature.)  Enchanted creature doesn't untap during its controller's untap step.
-id=19577
-name=Dehydration
-rarity=C
-type=Enchantment
-mana={3}{U}
-subtype=Aura
-[/card]
+
 [card]
 text=Trample     You may sacrifice three black creatures rather than pay Delraich's mana cost.
 id=19697
diff --git a/projects/mtg/bin/Res/sets/ONS/_cards.dat b/projects/mtg/bin/Res/sets/ONS/_cards.dat
index c674c6614..069cfb8c2 100644
--- a/projects/mtg/bin/Res/sets/ONS/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ONS/_cards.dat
@@ -121,6 +121,18 @@ auto=may copy target(creature)
 rarity=U
 [/card]
 [card]
+text={T}: Target creature with power 2 or less is unblockable this turn.
+id=40060
+alias=1285
+name=Crafty Pathmage
+mana={2}{U}
+type=Creature
+subtype=Human Wizard
+power=1
+toughness=1
+rarity=C
+[/card]
+[card]
 text={3}{W}: Tap target creature. {3}{W}: Crowd Favorites gets +0/+5 until end of turn.
 id=40653
 name=Crowd Favorites
diff --git a/projects/mtg/bin/Res/sets/ONS/todo.dat b/projects/mtg/bin/Res/sets/ONS/todo.dat
index a6f59e0a8..e218dc6b5 100644
--- a/projects/mtg/bin/Res/sets/ONS/todo.dat
+++ b/projects/mtg/bin/Res/sets/ONS/todo.dat
@@ -494,17 +494,7 @@ type=Enchantment
 text=As Cover of Darkness comes into play, choose a creature type.  Creatures of the chosen type have fear.
 rarity=R
 [/card]
-[card]
-id=40060
-name=Crafty Pathmage
-mana={2}{U}
-type=Creature
-subtype=Human Wizard
-power=1
-toughness=1
-text={T}: Target creature with power 2 or less is unblockable this turn.
-rarity=C
-[/card]
+
 [card]
 id=39883
 name=Crown of Ascension
diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp
index a359b6558..010762bf4 100644
--- a/projects/mtg/src/MTGAbility.cpp
+++ b/projects/mtg/src/MTGAbility.cpp
@@ -1558,14 +1558,6 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){
 		game->mLayers->stackLayer()->addDamage(card, target, damage);
 	break;
 	}
-
-  case 129521: //Dehydratation
-  // Don't understand why but target automatically untap when cast...
-    {
-			game->addObserver(NEW UntapBlocker(_id,card,card->target));
-      break;
-    }
-	
 	case 130369: // Soulblast
     {
 	    int damage = 0;