diff --git a/projects/mtg/bin/Res/sets/INV/_cards.dat b/projects/mtg/bin/Res/sets/INV/_cards.dat
index 90237b31a..3da20cad1 100644
--- a/projects/mtg/bin/Res/sets/INV/_cards.dat
+++ b/projects/mtg/bin/Res/sets/INV/_cards.dat
@@ -1314,6 +1314,19 @@ mana={1}{W}
 subtype=Aura
 [/card]
 [card]
+text=At the beginning of your upkeep, if Pyre Zombie is in your graveyard, you may pay {1}{B}{B}. If you do, return Pyre Zombie from your graveyard to your hand.   {1}{R}{R}, Sacrifice Pyre Zombie: Pyre Zombie deals 2 damage to target creature or player.
+id=23201
+name=Pyre Zombie
+rarity=R
+mana={1}{B}{R}
+type=Creature
+subtype=Zombie
+auto={1}{R}{R}:damage:2 target(creature,player)
+autograveyard={1}{B}{B}:moveTo(myhand) myUpkeepOnly
+power=2
+toughness=1
+[/card]
+[card]
 text=When Quirion Trailblazer enters the battlefield, you may search your library for a basic land card and put that card into play tapped. If you do, shuffle your library.
 id=23110
 target=land[basic]
diff --git a/projects/mtg/bin/Res/sets/INV/todo.dat b/projects/mtg/bin/Res/sets/INV/todo.dat
index 035065ca3..9da090509 100644
--- a/projects/mtg/bin/Res/sets/INV/todo.dat
+++ b/projects/mtg/bin/Res/sets/INV/todo.dat
@@ -803,17 +803,6 @@ type=Enchantment
 mana={2}{W}
 [/card]
 [card]
-text=At the beginning of your upkeep, if Pyre Zombie is in your graveyard, you may pay {1}{B}{B}. If you do, return Pyre Zombie from your graveyard to your hand.     {1}{R}{R}, Sacrifice Pyre Zombie: Pyre Zombie deals 2 damage to target creature or player.
-id=23201
-name=Pyre Zombie
-rarity=R
-type=Creature
-mana={1}{B}{R}
-power=2
-subtype=Zombie
-toughness=1
-[/card]
-[card]
 text=As Quirion Elves comes into play, choose a color.     {T}: Add {G} to your mana pool.     {T}: Add one mana of the chosen color to your mana pool.
 id=23112
 name=Quirion Elves
diff --git a/projects/mtg/bin/Res/sets/M10/_cards.dat b/projects/mtg/bin/Res/sets/M10/_cards.dat
index 1a2260b09..f0980e3e6 100644
--- a/projects/mtg/bin/Res/sets/M10/_cards.dat
+++ b/projects/mtg/bin/Res/sets/M10/_cards.dat
@@ -1088,6 +1088,20 @@ auto={B}:1/1
 rarity=C
 [/card]
 [card]
+text=Flying   When Magma Phoenix is put into a graveyard from the battlefield, it deals 3 damage to each creature and each player.   {3}{R}{R}: Return Magma Phoenix from your graveyard to your hand.
+id=191397
+auto=@moveTo(this|graveyard) from(myBattlefield):damage:3 all(creature,player)
+autograveyard={3}{R}{R}:moveTo(myhand)
+name=Magma Phoenix
+rarity=R
+mana={3}{R}{R}
+type=Creature
+subtype=Phoenix
+power=3
+toughness=3
+abilities=flying
+[/card]
+[card]
 id=189904
 name=Megrim
 mana={2}{B}
diff --git a/projects/mtg/bin/Res/sets/M10/todo.dat b/projects/mtg/bin/Res/sets/M10/todo.dat
index f8ff2f9ad..5892a0151 100644
--- a/projects/mtg/bin/Res/sets/M10/todo.dat
+++ b/projects/mtg/bin/Res/sets/M10/todo.dat
@@ -9,7 +9,6 @@ toughness=2
 text=Deathtouch (Creatures dealt damage by this creature are destroyed. You can divide this creature's combat damage among any of the creatures blocking or blocked by it.) When Acidic Slime enters the battlefield, destroy target artifact, enchantment, or land.
 rarity=U
 [/card]
-
 [card]
 id=191239
 name=Ajani Goldmane
@@ -30,7 +29,6 @@ toughness=1
 text=When Awakener Druid enters the battlefield, target Forest becomes a 4/5 green Treefolk creature for as long as Awakener Druid is on the battlefield. It's still a land.
 rarity=U
 [/card]
-
 [card]
 id=191340
 name=Bogardan Hellkite
@@ -102,7 +100,6 @@ text=Trample Darksteel Colossus is indestructible. If Darksteel Colossus would b
 rarity=M
 abilities=indestructible
 [/card]
-
 [card]
 id=190198
 name=Djinn of Wishes
@@ -166,7 +163,6 @@ type=Land
 text=Glacial Fortress enters the battlefield tapped unless you control a Plains or an Island. {T}: Add {W} or {U} to your mana pool.
 rarity=R
 [/card]
-
 [card]
 id=193766
 name=Guardian Seraph
@@ -295,17 +291,6 @@ auto=preventallcombatdamage to(mytgt)
 rarity=R
 [/card]
 [card]
-id=191397
-name=Magma Phoenix
-mana={3}{R}{R}
-type=Creature
-subtype=Phoenix
-power=3
-toughness=3
-text=Flying When Magma Phoenix is put into a graveyard from the battlefield, it deals 3 damage to each creature and each player. {3}{R}{R}: Return Magma Phoenix from your graveyard to your hand.
-rarity=R
-[/card]
-[card]
 id=193748
 name=Manabarbs
 mana={3}{R}
diff --git a/projects/mtg/bin/Res/sets/MRD/todo.dat b/projects/mtg/bin/Res/sets/MRD/todo.dat
index 2d1cf1546..25dc7444f 100644
--- a/projects/mtg/bin/Res/sets/MRD/todo.dat
+++ b/projects/mtg/bin/Res/sets/MRD/todo.dat
@@ -851,19 +851,8 @@ power=1
 subtype=Bird
 toughness=1
 [/card]
-
-
 [card]
-text=Equipped creature gets +1/+1 for each Swamp you control.     Equip-Pay 3 life. (Pay 3 life: 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=49770
-name=Nightmare Lash
-rarity=R
-type=Artifact
-mana={4}
-subtype=Equipment
-[/card]
-[card]
-text=Nim Devourer gets +1/+0 for each artifact you control. {B}{B}: Return Nim Devourer from your graveyard to play, then sacrifice a creature. Play this ability only during your upkeep.
+text=Nim Devourer gets +1/+0 for each artifact you control.   {B}{B}: Return Nim Devourer from your graveyard to play, then sacrifice a creature. Activate this ability only during your upkeep.
 id=46090
 name=Nim Devourer
 rarity=R
@@ -874,6 +863,15 @@ subtype=Zombie
 toughness=1
 [/card]
 [card]
+text=Equipped creature gets +1/+1 for each Swamp you control.     Equip-Pay 3 life. (Pay 3 life: 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=49770
+name=Nightmare Lash
+rarity=R
+type=Artifact
+mana={4}
+subtype=Equipment
+[/card]
+[card]
 text=Pentavus comes into play with five +1/+1 counters on it.     {1}, Remove a +1/+1 counter from Pentavus: Put a 1/1 Pentavite artifact creature token with flying into play.     {1}, Sacrifice a Pentavite: Put a +1/+1 counter on Pentavus.
 id=46703
 auto=counter(1/1,5)