diff --git a/projects/mtg/bin/Res/sets/EVE/_cards.dat b/projects/mtg/bin/Res/sets/EVE/_cards.dat
index 3bbf4dbe7..a413dad09 100644
--- a/projects/mtg/bin/Res/sets/EVE/_cards.dat
+++ b/projects/mtg/bin/Res/sets/EVE/_cards.dat
@@ -24,6 +24,21 @@ subtype=Archon
 toughness=4
 [/card]
 [card]
+text=Other red creatures you control get +1/+1.     Other white creatures you control get +1/+1.     Whenever you play a red spell, Balefire Liege deals 3 damage to target player.     Whenever you play a white spell, you gain 3 life.
+id=158104
+auto=lord(creature[red]) 1/1
+auto=lord(creature[white]) 1/1
+auto=@movedto(*[red]|mystack):damage:3 target(player)
+auto=@movedto(*[white]|mystack):life:3
+name=Balefire Liege
+rarity=R
+type=Creature
+mana={2}{RW}{RW}{RW}
+power=2
+subtype=Spirit Horror
+toughness=4
+[/card]
+[card]
 text=Remove target card in a graveyard from the game. Put a 1/1 white and black Spirit creature token with flying into play.
 target=*|graveyard
 auto=moveTo(removedfromgame)
@@ -68,6 +83,35 @@ subtype=Plant Zombie
 toughness=3
 [/card]
 [card]
+text=Other black creatures you control get +1/+1.     Other green creatures you control get +1/+1.     At the beginning of your upkeep, you may put a 1/1 black and green Worm creature token into play.
+id=157406
+auto=lord(creature[black]) 1/1 other
+auto=lord(creature[green]) 1/1 other
+auto=@each my upkeep:may token(Worm,Worm Creature, 1/1,green black)
+name=Creakwood Liege
+rarity=R
+type=Creature
+mana={1}{BG}{BG}{BG}
+power=2
+subtype=Horror
+toughness=2
+[/card]
+[card]
+text=Other white creatures you control get +1/+1.     Other black creatures you control get +1/+1.     Whenever you play a white spell, you may tap target creature.     Whenever you play a black spell, you may destroy target creature if it's tapped.
+id=157288
+auto=lord(creature[black]) 1/1 other
+auto=lord(creature[white]) 1/1 other
+auto=@moveto(*[black]|mystack):may destroy target(creature[tapped])
+auto=@moveto(*[white]|mystack):may tap target(creature)
+name=Deathbringer Liege
+rarity=R
+type=Creature
+mana={2}{WB}{WB}{WB}
+power=3
+subtype=Horror
+toughness=4
+[/card]
+[card]
 text=Target creature gains double strike until end of turn. (It deals both first-strike and regular combat damage.)
 target=creature
 auto=double strike
@@ -294,6 +338,20 @@ subtype=Horror
 toughness=4
 [/card]
 [card]
+text=Other green creatures you control get +1/+1.     Other blue creatures you control get +1/+1.     Untap all green and/or blue creatures you control during each other player's untap step.
+id=152091
+auto=lord(creature[green]) 1/1 other
+auto=lord(creature[blue]) 1/1 other
+name=Murkfiend Liege
+auto=@each opponent untap:untap all(creature[green;blue]|myInplay)
+rarity=R
+type=Creature
+mana={2}{GU}{GU}{GU}
+power=4
+subtype=Horror
+toughness=4
+[/card]
+[card]
 text=Lifelink (Whenever this creature deals damage, you gain that much life.)
 abilities=lifelink
 id=150986
diff --git a/projects/mtg/bin/Res/sets/EVE/todo.dat b/projects/mtg/bin/Res/sets/EVE/todo.dat
index 8135594a2..1c917b393 100644
--- a/projects/mtg/bin/Res/sets/EVE/todo.dat
+++ b/projects/mtg/bin/Res/sets/EVE/todo.dat
@@ -1,6 +1,7 @@
 [card]
 text=Sacrifice Aerie Ouphes: Aerie Ouphes deals damage equal to its power to target creature with flying.     Persist (When this creature is put into a graveyard from play, if it had no -1/-1 counters on it, return it to play under its owner's control with a -1/-1 counter on it.)
 id=153427
+abilities=persist
 name=Aerie Ouphes
 rarity=C
 type=Creature
@@ -12,6 +13,7 @@ toughness=3
 [card]
 text=Trample     Altar Golem's power and toughness are each equal to the number of creatures in play.     Altar Golem doesn't untap during your untap step.     Tap five untapped creatures you control: Untap Altar Golem.
 id=157974
+abilities=doesnotuntap
 name=Altar Golem
 rarity=R
 type=Artifact Creature
@@ -32,19 +34,6 @@ subtype=Elemental Shaman
 toughness=4
 [/card]
 [card]
-text=Other red creatures you control get +1/+1.     Other white creatures you control get +1/+1.     Whenever you play a red spell, Balefire Liege deals 3 damage to target player.     Whenever you play a white spell, you gain 3 life.
-id=158104
-auto=lord(creature[red]) 1/1
-auto=lord(creature[white]) 1/1
-name=Balefire Liege
-rarity=R
-type=Creature
-mana={2}{RW}{RW}{RW}
-power=2
-subtype=Spirit Horror
-toughness=4
-[/card]
-[card]
 text={T}: Tap target creature.     Whenever you play a white spell, you may untap Ballynock Trapper.
 id=153480
 name=Ballynock Trapper
@@ -227,20 +216,6 @@ power=2
 subtype=Shapeshifter
 toughness=4
 [/card]
-
-[card]
-text=Other black creatures you control get +1/+1.     Other green creatures you control get +1/+1.     At the beginning of your upkeep, you may put a 1/1 black and green Worm creature token into play.
-id=157406
-auto=lord(creature[black]) 1/1 other
-auto=lord(creature[green]) 1/1 other
-name=Creakwood Liege
-rarity=R
-type=Creature
-mana={1}{BG}{BG}{BG}
-power=2
-subtype=Horror
-toughness=2
-[/card]
 [card]
 text=At the beginning of your upkeep, destroy target creature with a -1/-1 counter on it.
 id=158103
@@ -250,19 +225,6 @@ type=Enchantment
 mana={1}{B}
 [/card]
 [card]
-text=Other white creatures you control get +1/+1.     Other black creatures you control get +1/+1.     Whenever you play a white spell, you may tap target creature.     Whenever you play a black spell, you may destroy target creature if it's tapped.
-id=157288
-auto=lord(creature[black]) 1/1 other
-auto=lord(creature[white]) 1/1 other
-name=Deathbringer Liege
-rarity=R
-type=Creature
-mana={2}{WB}{WB}{WB}
-power=3
-subtype=Horror
-toughness=4
-[/card]
-[card]
 text=Trample     Deity of Scars comes into play with two -1/-1 counters on it.     {BG}, Remove a -1/-1 counter from Deity of Scars: Regenerate Deity of Scars.
 id=153488
 name=Deity of Scars
@@ -745,19 +707,6 @@ type=Sorcery
 mana={3}{G}
 [/card]
 [card]
-text=Other green creatures you control get +1/+1.     Other blue creatures you control get +1/+1.     Untap all green and/or blue creatures you control during each other player's untap step.
-id=152091
-auto=lord(creature[green]) 1/1 other
-auto=lord(creature[blue]) 1/1 other
-name=Murkfiend Liege
-rarity=R
-type=Creature
-mana={2}{GU}{GU}{GU}
-power=4
-subtype=Horror
-toughness=4
-[/card]
-[card]
 text=Wither (This deals damage to creatures in the form of -1/-1 counters.)  Whenever a creature an opponent controls with a -1/-1 counter on it is put into a graveyard, you may return that card to play under your control.
 abilities=wither
 id=152080
diff --git a/projects/mtg/bin/Res/sets/RV/_cards.dat b/projects/mtg/bin/Res/sets/RV/_cards.dat
index eac29a64f..b82922867 100644
--- a/projects/mtg/bin/Res/sets/RV/_cards.dat
+++ b/projects/mtg/bin/Res/sets/RV/_cards.dat
@@ -126,7 +126,7 @@ subtype=Mountain Swamp
 [card]
 text=Basalt Monolith doesn't untap during your untap step.     {3}: Untap Basalt Monolith.     {T}: Add {3} to your mana pool.
 id=1096
-auto=doesnotuntap
+abilities=doesnotuntap
 auto={3}:untap
 auto={T}:add:{3}
 name=Basalt Monolith
@@ -251,7 +251,7 @@ mana={X}{U}{U}
 [card]
 text=Brass Man doesn't untap during your untap step.     At the beginning of your upkeep, you may pay {1}. If you do, untap Brass Man.
 id=1099
-auto=doesnotuntap
+abilities=doesnotuntap
 auto={1}:untap
 name=Brass Man
 rarity=U
@@ -1113,8 +1113,7 @@ subtype=Island
 [card]
 text=Island Fish Jasconius can't attack unless defending player controls an Island.     Jasconius doesn't untap during your untap step.     At the beginning of your upkeep, you may pay {U}{U}{U}. If you do, untap Jasconius.     When you control no Islands, sacrifice Jasconius.
 id=1203
-abilities=islandhome
-auto=doesnotuntap
+abilities=islandhome,doesnotuntap
 auto={U}{U}{U}:untap
 name=Island Fish Jasconius
 rarity=R