diff --git a/projects/mtg/bin/Res/sets/mtg_todo.dat b/projects/mtg/bin/Res/sets/mtg_todo.dat
index c51281ee7..313a642f0 100644
--- a/projects/mtg/bin/Res/sets/mtg_todo.dat
+++ b/projects/mtg/bin/Res/sets/mtg_todo.dat
@@ -5746,24 +5746,12 @@ type=Enchantment
 [/card]
 [card]
 name=Clutch of Undeath
-target=creature
-auto=aslongas(mytgt[black])3/3
-auto=aslongas(mytgt[-black])-3/-3
 text=Enchant creature -- Enchanted creature gets +3/+3 as long as it's a Zombie. Otherwise, it gets -3/-3.
 mana={3}{B}{B}
 type=Enchantment
 subtype=Aura
 [/card]
 [card]
-name=Coal Stoker
-text=When Coal Stoker enters the battlefield, if you cast it from your hand, add {R}{R}{R} to your mana pool.
-mana={3}{R}
-type=Creature
-subtype=Elemental
-power=3
-toughness=3
-[/card]
-[card]
 name=Coalhauler Swine
 text=Whenever Coalhauler Swine is dealt damage, it deals that much damage to each player.
 mana={4}{R}{R}
@@ -22923,24 +22911,6 @@ mana={6}
 type=Artifact
 [/card]
 [card]
-name=Myojin of Cleansing Fire
-text=Myojin of Cleansing Fire enters the battlefield with a divinity counter on it if you cast it from your hand. -- Myojin of Cleansing Fire is indestructible as long as it has a divinity counter on it. -- Remove a divinity counter from Myojin of Cleansing Fire: Destroy each other creature.
-mana={5}{W}{W}{W}
-type=Legendary Creature
-subtype=Spirit
-power=4
-toughness=6
-[/card]
-[card]
-name=Myojin of Infinite Rage
-text=Myojin of Infinite Rage enters the battlefield with a divinity counter on it if you cast it from your hand. -- Myojin of Infinite Rage is indestructible as long as it has a divinity counter on it. -- Remove a divinity counter from Myojin of Infinite Rage: Destroy all lands.
-mana={7}{R}{R}{R}
-type=Legendary Creature
-subtype=Spirit
-power=7
-toughness=4
-[/card]
-[card]
 name=Myojin of Life's Web
 text=Myojin of Life's Web enters the battlefield with a divinity counter on it if you cast it from your hand. -- Myojin of Life's Web is indestructible as long as it has a divinity counter on it. -- Remove a divinity counter from Myojin of Life's Web: Put any number of creature cards from your hand onto the battlefield.
 mana={6}{G}{G}{G}
@@ -22950,24 +22920,6 @@ power=8
 toughness=8
 [/card]
 [card]
-name=Myojin of Night's Reach
-text=Myojin of Night's Reach enters the battlefield with a divinity counter on it if you cast it from your hand. -- Myojin of Night's Reach is indestructible as long as it has a divinity counter on it. -- Remove a divinity counter from Myojin of Night's Reach: Each opponent discards his or her hand.
-mana={5}{B}{B}{B}
-type=Legendary Creature
-subtype=Spirit
-power=5
-toughness=2
-[/card]
-[card]
-name=Myojin of Seeing Winds
-text=Myojin of Seeing Winds enters the battlefield with a divinity counter on it if you cast it from your hand. -- Myojin of Seeing Winds is indestructible as long as it has a divinity counter on it. -- Remove a divinity counter from Myojin of Seeing Winds: Draw a card for each permanent you control.
-mana={7}{U}{U}{U}
-type=Legendary Creature
-subtype=Spirit
-power=3
-toughness=3
-[/card]
-[card]
 name=Myr Adapter
 text=Myr Adapter gets +1/+1 for each Equipment attached to it.
 mana={3}
@@ -28505,12 +28457,12 @@ mana={2}
 type=Artifact
 [/card]
 [card]
-#####Never worked! Needs some engine fixing....
 name=Reiver Demon
 abilities=flying
-auto=@movedTo(this|myBattlefield) from(mystack):destroy all(creature[-black;-artifact])
+auto=kicker bury all(creature[-artifact;-black])
 text=Flying -- When Reiver Demon enters the battlefield, if you cast it from your hand, destroy all nonartifact, nonblack creatures. They can't be regenerated.
 mana={4}{B}{B}{B}{B}
+kicker={0}
 type=Creature
 subtype=Demon
 power=6
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 22c00b154..9c161833b 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -8667,6 +8667,17 @@ power=3
 toughness=3
 [/card]
 [card]
+name=Coal Stoker
+auto=kicker add{R}{R}{R}
+text=When Coal Stoker enters the battlefield, if you cast it from your hand, add {R}{R}{R} to your mana pool.
+mana={3}{R}
+kicker={0}
+type=Creature
+subtype=Elemental
+power=3
+toughness=3
+[/card]
+[card]
 name=Coalition Victory
 auto=aslongas(plains|myBattlefield)aslongas(island|myBattlefield)aslongas(swamp|myBattlefield)aslongas(mountain|myBattlefield)aslongas(forest|myBattlefield)aslongas(creature[white]|myBattlefield)aslongas(creature[blue]|myBattlefield)aslongas(creature[black]|myBattlefield)aslongas(creature[red]|myBattlefield)aslongas(creature[green]|myBattlefield) winGame
 text=You win the game if you control a land of each basic land type and a creature of each color.
@@ -30719,6 +30730,58 @@ power=5
 toughness=4
 [/card]
 [card]
+name=Myojin of Cleansing Fire
+auto=kicker counter(0/0,1,Divinity)
+auto=this(counter{0/0.1.Divinity}) indestructible
+auto={C(0/0,-1,Divinity)}:destroy all(other creature)
+text=Myojin of Cleansing Fire enters the battlefield with a divinity counter on it if you cast it from your hand. Myojin of Cleansing Fire is indestructible as long as it has a divinity counter on it. Remove a divinity counter from Myojin of Cleansing Fire: Destroy all other creatures.
+mana={5}{W}{W}{W}
+kicker={0}
+power=4
+toughness=6
+type=Creature
+subtype=Legendary Spirit
+[/card]
+[card]
+name=Myojin of Infinite Rage
+auto=kicker counter(0/0,1,Divinity)
+auto=this(counter{0/0.1.Divinity}) indestructible
+auto={C(0/0,-1,Divinity)}:destroy all(land)
+text=Myojin of Infinite Rage enters the battlefield with a divinity counter on it if you cast it from your hand. -- Myojin of Infinite Rage is indestructible as long as it has a divinity counter on it. -- Remove a divinity counter from Myojin of Infinite Rage: Destroy all lands.
+mana={7}{R}{R}{R}
+kicker={0}
+type=Legendary Creature
+subtype=Spirit
+power=7
+toughness=4
+[/card]
+[card]
+name=Myojin of Night's Reach
+auto=kicker counter(0/0,1,Divinity)
+auto=this(counter{0/0.1.Divinity}) indestructible
+auto={C(0/0,-1,Divinity)}:moveTo(graveyard) all(*|opponenthand)
+text=Myojin of Night's Reach enters the battlefield with a divinity counter on it if you cast it from your hand. -- Myojin of Night's Reach is indestructible as long as it has a divinity counter on it. -- Remove a divinity counter from Myojin of Night's Reach: Each opponent discards his or her hand.
+mana={5}{B}{B}{B}
+kicker={0}
+type=Legendary Creature
+subtype=Spirit
+power=5
+toughness=2
+[/card]
+[card]
+name=Myojin of Seeing Winds
+auto=kicker counter(0/0,1,Divinity)
+auto=this(counter{0/0.1.Divinity}) indestructible
+auto={C(0/0,-1,Divinity)}:foreach(*|myBattlefield) draw:1
+text=Myojin of Seeing Winds enters the battlefield with a divinity counter on it if you cast it from your hand. -- Myojin of Seeing Winds is indestructible as long as it has a divinity counter on it. -- Remove a divinity counter from Myojin of Seeing Winds: Draw a card for each permanent you control.
+mana={7}{U}{U}{U}
+kicker={0}
+type=Legendary Creature
+subtype=Spirit
+power=3
+toughness=3
+[/card]
+[card]
 name=Myr Matrix
 abilities=indestructible
 auto=lord(Myr)1/1
diff --git a/projects/mtg/bin/Res/sets/primitives/zethaddon.txt b/projects/mtg/bin/Res/sets/primitives/zethaddon.txt
index 7f9193a40..0b798308a 100644
--- a/projects/mtg/bin/Res/sets/primitives/zethaddon.txt
+++ b/projects/mtg/bin/Res/sets/primitives/zethaddon.txt
@@ -83,24 +83,6 @@ mana={1}{R}
 type=Instant
 [/card]
 [card]
-name=Reiver Demon
-auto=kicker token(-99775533)*2 
-text=When Reiver Demon enters the battlefield, if you cast it from your hand, destroy all nonartifact, nonblack creatures. They can't be regenerated.
-mana={B}{B}{B}{B}{4}
-kicker={0}
-power=6
-toughness=6
-type=creature
-subtype=demon
-abilities=flying
-[/card]
-[card]
-name=Demoncasteffect
-auto=destroy all(creature[-artifact,-black]) && bury all(this)
-type=nothing
-id=-99775533
-[/card]
-[card]
 name=Iname as One
 auto=kicker token(-99775523)
 text=When Iname as One comes into play, if you played it from your hand, you may search your library for a  Spirit card, put it into play, then shuffle your library. When Iname is put into a graveyard from play, you may remove it from the game. If you do, return target  Spirit card from your graveyard to play. 
@@ -137,65 +119,6 @@ type=nothing
 id=-99775513
 [/card]
 [card]
-name=coal stoker
-auto=kicker token(-99775413)
-text=When Coal Stoker enters the battlefield, if you cast it from your hand, add {R}{R}{R} to your mana pool.
-mana={3}{R}
-kicker={0}
-power=3
-toughness=3
-type=creature
-subtype=elemental
-[/card]
-[card]
-name=casteffect
-auto=Add{R}{R}{R} && bury all(this)
-type=nothing
-id=-99775413
-[/card]
-[card]
-name=Myojin of Cleansing Fire
-auto=kicker token(-99775213)
-auto=counter(0/0,0,Divinity)
-auto=this(counter{0/0,1,Divinity}) indestructible
-auto={C(0/0,-1,Divinity)}:destroy all(other creature)
-auto={C(0/0,-1,Divinity)}:destroy all(other creature)
-text=Myojin of Cleansing Fire enters the battlefield with a divinity counter on it if you cast it from your hand. Myojin of Cleansing Fire is indestructible as long as it has a divinity counter on it. Remove a divinity counter from Myojin of Cleansing Fire: Destroy all other creatures.
-mana={5}{W}{W}{W}
-kicker={0}
-power=4
-toughness=6
-type=creature
-subtype=legendary spirit
-[/card]
-[card]
-name=myojincasteffect
-auto=counter(0/0,1,Divinity) all(Myojin of Cleansing Fire) && bury all(this)
-type=nothing
-id=-99775213
-[/card]
-[card]
-name=Myojin of Infinite Rage
-auto=kicker token(-99775214)
-auto=counter(0/0,0,Divinity)
-auto=this(counter{0/0,1,Divinity}) indestructible
-auto={C(0/0,-1,Divinity)}:destroy all(land)
-auto={C(0/0,-1,Divinity)}:destroy all(land)
-text=Myojin of Infinite Rage enters the battlefield with a divinity counter on it if you cast it from your hand. Myojin of Infinite Rage is indestructible as long as it has a divinity counter on it. Remove a divinity counter from Myojin of Infinite Rage: Destroy all lands.
-mana={7}{R}{R}{R}
-kicker={0}
-power=7
-toughness=4
-type=creature
-subtype=legendary spirit
-[/card]
-[card]
-name=myojincasteffect
-auto=counter(0/0,1,Divinity) all(Myojin of Infinite Rage) && bury all(this)
-type=nothing
-id=-99775214
-[/card]
-[card]
 name=Myojin of Life's Web
 auto=kicker token(-99774213)
 auto=counter(0/0,0,Divinity)
@@ -217,48 +140,6 @@ type=nothing
 id=-99774213
 [/card]
 [card]
-name=Myojin of Night's Reach
-auto=kicker token(-99764213)
-auto=counter(0/0,0,Divinity)
-auto=this(counter{0/0,1,Divinity}) indestructible
-auto={C(0/0,-1,Divinity)}: moveto(opponentgraveyard) all(*|opponenthand)
-auto={C(0/0,-1,Divinity)}: moveto(opponentgraveyard) all(*|opponenthand)
-text=Myojin of Night's Reach enters the battlefield with a divinity counter on it if you cast it from your hand. Myojin of Night's Reach is indestructible as long as it has a divinity counter on it. Remove a divinity counter from Myojin of Night's Reach: Each opponent discards his or her hand.
-mana={5}{B}{B}{B}
-kicker={0}
-power=5
-toughness=2
-type=creature
-subtype=legendary spirit
-[/card]
-[card]
-name=myojincasteffect
-auto=counter(0/0,1,Divinity) all(Myojin of Night's Reach) && bury all(this)
-type=nothing
-id=-99764213
-[/card]
-[card]
-name=Myojin of Seeing Winds
-auto=kicker token(-99464213)
-auto=counter(0/0,0,Divinity)
-auto=this(counter{0/0,1,Divinity}) indestructible
-auto={C(0/0,-1,Divinity)}: foreach(*|battlefield) draw:1
-auto={C(0/0,-1,Divinity)}: foreach(*|battlefield) draw:1
-text=Myojin of Seeing Winds enters the battlefield with a divinity counter on it if you cast it from your hand. Myojin of Seeing Winds is indestructible as long as it has a divinity counter on it. Remove a divinity counter from Myojin of Seeing Winds: Draw a card for each permanent you control.
-mana={7}{U}{U}{U}
-kicker={0}
-power=3
-toughness=3
-type=creature
-subtype=legendary spirit
-[/card]
-[card]
-name=myojincasteffect
-auto=counter(0/0,1,Divinity) all(Myojin of Seeing Winds) && bury all(this)
-type=nothing
-id=-99464213
-[/card]
-[card]
 name=Promise of Power
 kicker={4}
 auto=kicker token(-7776777)