diff --git a/projects/mtg/bin/Res/sets/EXO/_cards.dat b/projects/mtg/bin/Res/sets/EXO/_cards.dat
index a1a3f7f51..0d6c02e4c 100644
--- a/projects/mtg/bin/Res/sets/EXO/_cards.dat
+++ b/projects/mtg/bin/Res/sets/EXO/_cards.dat
@@ -62,6 +62,15 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+id=6168
+name=City of Traitors
+type=Land
+text=When you play another land, sacrifice City of Traitors.  {T}: Add {2} to your mana pool.
+auto=@movedTo(land|myinplay):bury
+auto={T}:Add:2
+rarity=R
+[/card]
+[card]
 text=Shadow (This creature can block or be blocked by only creatures with shadow.)   {1}{B}, {T}: Destroy target creature with shadow.
 id=6091
 name=Dauthi Cutthroat
@@ -181,6 +190,18 @@ toughness=5
 abilities=flying,cantattack
 [/card]
 [card]
+id=6138
+name=Jackalope Herd
+mana={3}{G}
+type=Creature
+subtype=Rabbit Beast
+power=4
+toughness=5
+text=When you play a spell, return Jackalope Herd to its owner's hand.
+auto=@movedTo(*|mystack):moveTo(ownerHand)
+rarity=C
+[/card]
+[card]
 text={U}: Killer Whale gains flying until end of turn.
 id=6065
 name=Killer Whale
@@ -250,6 +271,15 @@ mana={1}{B}
 type=Instant
 [/card]
 [card]
+id=5176
+name=Null Brooch
+mana={4}
+type=Artifact
+text={2}, {T}, Discard your hand: Counter target noncreature spell.
+auto={2}{T}:fizzle target(*|[-creature]|stack) && moveTo(graveyard) all(*|myhand)
+rarity=R
+[/card]
+[card]
 text=First strike, protection from black, protection from red (This creature deals combat damage before creatures without first strike. It can't be blocked, targeted, dealt damage, or enchanted by anything black or red.)
 id=5199
 name=Paladin en-Vec
@@ -491,6 +521,18 @@ power=*
 toughness=*
 [/card]
 [card]
+id=6033
+name=Soul Warden
+mana={W}
+type=Creature
+subtype=Human Cleric
+power=1
+toughness=1
+text=Whenever another creature comes into play, you gain 1 life.
+auto=@movedTo(creature|battlefield):life:1
+rarity=U
+[/card]
+[card]
 text=Vigilance
 id=6032
 name=Standing Troops
@@ -600,6 +642,18 @@ toughness=2
 abilities=flying
 [/card]
 [card]
+id=6034
+name=Welkin Hawk
+mana={1}{W}
+type=Creature
+subtype=Bird
+power=1
+toughness=1
+text=Flying When Welkin Hawk is put into a graveyard from play, you may search your library for a card named Welkin Hawk, reveal that card, put it into your hand, then shuffle your library.
+auto=@movedTo(this|graveyard):may moveTo(myHand) target(Welkin Hawk|mylibrary)
+rarity=C
+[/card]
+[card]
 text={U}: Whiptongue Frog gains flying until end of turn.
 id=6057
 name=Whiptongue Frog
diff --git a/projects/mtg/bin/Res/sets/EXO/todo.dat b/projects/mtg/bin/Res/sets/EXO/todo.dat
index bb8a1dd8c..942e50640 100644
--- a/projects/mtg/bin/Res/sets/EXO/todo.dat
+++ b/projects/mtg/bin/Res/sets/EXO/todo.dat
@@ -75,13 +75,7 @@ toughness=2
 text={R}: Cinder Crawler gets +1/+0 until end of turn. Play this ability only if Cinder Crawler is blocked.
 rarity=C
 [/card]
-[card]
-id=6168
-name=City of Traitors
-type=Land
-text=When you play another land, sacrifice City of Traitors.  {T}: Add {2} to your mana pool.
-rarity=R
-[/card]
+
 [card]
 id=6162
 name=Coat of Arms
@@ -251,17 +245,7 @@ type=Enchantment
 text=Each creature you control can block an additional creature.
 rarity=U
 [/card]
-[card]
-id=6138
-name=Jackalope Herd
-mana={3}{G}
-type=Creature
-subtype=Rabbit Beast
-power=4
-toughness=5
-text=When you play a spell, return Jackalope Herd to its owner's hand.
-rarity=C
-[/card]
+
 [card]
 id=6142
 name=Keeper of the Beasts
@@ -442,14 +426,7 @@ type=Instant
 text=Play Necrologia only during your end of turn step.  As an additional cost to play Necrologia, pay any amount of life.  Draw cards equal to the life paid this way.
 rarity=U
 [/card]
-[card]
-id=5176
-name=Null Brooch
-mana={4}
-type=Artifact
-text={2}, {T}, Discard your hand: Counter target noncreature spell.
-rarity=R
-[/card]
+
 [card]
 id=6151
 name=Oath of Druids
@@ -580,7 +557,7 @@ mana={1}{R}
 type=Instant
 text=Price of Progress deals 2 damage to each player for each nonbasic land he or she controls.
 auto=foreach(land[-basic]|myinplay) life:-2
-auto=foreach(land[-basic]|opponentinplay) damage:2 target(player)
+auto=foreach(land[-basic]|opponentinplay) damage:2 opponent #does not work yet
 rarity=U
 [/card]
 [card]
@@ -697,17 +674,7 @@ type=Instant
 text=As an additional cost to play Sonic Burst, discard a card at random. Sonic Burst deals 4 damage to target creature or player.
 rarity=C
 [/card]
-[card]
-id=6033
-name=Soul Warden
-mana={W}
-type=Creature
-subtype=Human Cleric
-power=1
-toughness=1
-text=Whenever another creature comes into play, you gain 1 life.
-rarity=U
-[/card]
+
 [card]
 id=6158
 name=Spellbook
@@ -828,17 +795,7 @@ toughness=7
 text=Defender (This creature can't attack.) At end of combat, remove from the game all creatures blocked by Wall of Nets. When Wall of Nets leaves play, return to play under their owners' control all creatures removed from the game with Wall of Nets.
 rarity=R
 [/card]
-[card]
-id=6034
-name=Welkin Hawk
-mana={1}{W}
-type=Creature
-subtype=Bird
-power=1
-toughness=1
-text=Flying When Welkin Hawk is put into a graveyard from play, you may search your library for a card named Welkin Hawk, reveal that card, put it into your hand, then shuffle your library.
-rarity=C
-[/card]
+
 [card]
 id=6156
 name=Workhorse
diff --git a/projects/mtg/bin/Res/sets/LEG/_cards.dat b/projects/mtg/bin/Res/sets/LEG/_cards.dat
index ba71d260d..498f80e24 100644
--- a/projects/mtg/bin/Res/sets/LEG/_cards.dat
+++ b/projects/mtg/bin/Res/sets/LEG/_cards.dat
@@ -48,6 +48,26 @@ power=8
 toughness=4
 [/card]
 [card]
+text=Creatures you control get +1/+1 as long as you control no nonartifact, nonwhite creatures.
+auto=lord(creature|myinplay) 1/1
+auto=aslongas(creature[-artifact;-white]|myinplay) lord(creature|myinplay) 1/1
+id=1602
+name=Angelic Voices
+rarity=R
+type=Enchantment
+mana={2}{W}{W}
+[/card]
+[card]
+text=Legendary creatures don't untap during their controllers' untap steps. When Arena of the Ancients comes into play, tap all legendary creatures.
+auto=lord(creature[legendary]) doesnotuntap
+auto=tap all(creature[legendary]) 
+id=1400
+name=Arena of the Ancients
+rarity=R
+type=Artifact
+mana={3}
+[/card]
+[card]
 text=Flying (This creature can't be blocked except by creatures with flying or reach.)
 id=1472
 name=Azure Drake
@@ -467,6 +487,15 @@ type=Instant
 mana={W}
 [/card]
 [card]
+text={B}, Pay 2 life: Draw a card.
+auto={B}:draw:1 && life:-2
+id=1441
+name=Greed
+rarity=R
+type=Enchantment
+mana={3}{B}
+[/card]
+[card]
 text={T}: Target player discards a card at random. Play this ability only during your turn.
 id=1654
 name=Gwendlyn Di Corci
@@ -490,6 +519,17 @@ mana={2}{W}
 type=Enchantment
 [/card]
 [card]
+text=Legendary     {T}: Add {R} to your mana pool.      {T}: Target creature loses all landwalk abilities until end of turn.
+auto={T}:Add {R}
+auto={T}:-plainswalk && -islandwalk && -swampwalk && -mountainwalk && -forestwalk target(creature)
+id=1700
+name=Hammerheim
+color=Land
+rarity=U
+type=Land
+abilities=legendary
+[/card]
+[card]
 id=1442
 name=Headless Horseman
 color=Black
@@ -523,6 +563,17 @@ power=1
 toughness=1
 [/card]
 [card]
+text=Destroy all nonblack creatures. Hellfire deals X plus 3 damage to you, where X is the number of creatures put into all graveyards this way.
+auto=foreach(creature[-black]) damage:1 controller
+auto=damage:3 controller
+auto=destroy all(creature[-black]) 
+id=1445
+name=Hellfire
+rarity=R
+type=Sorcery
+mana={2}{B}{B}{B}
+[/card]
+[card]
 id=1530
 name=Hornet Cobra
 color=Green
@@ -1129,6 +1180,19 @@ toughness=7
 abilities=legendary
 [/card]
 [card]
+text=Swampwalk,Legendary     Whenever a player plays a black spell, you gain 1 life.
+abilities=swampwalk,Legendary
+auto=@movedTo(*[black]|stack):life:1
+id=1685
+name=Sol'kanar the Swamp King
+rarity=R
+type=Creature
+mana={2}{U}{B}{R}
+power=5
+subtype=Demon
+toughness=5
+[/card]
+[card]
 text={T}: Destroy target blue creature.
 id=1590
 name=Spinal Villain
diff --git a/projects/mtg/bin/Res/sets/LEG/todo.dat b/projects/mtg/bin/Res/sets/LEG/todo.dat
index 8d5da2d36..c16a4a68e 100644
--- a/projects/mtg/bin/Res/sets/LEG/todo.dat
+++ b/projects/mtg/bin/Res/sets/LEG/todo.dat
@@ -78,14 +78,7 @@ power=1
 subtype=Kithkin
 toughness=1
 [/card]
-[card]
-text=Creatures you control get +1/+1 as long as you control no nonartifact, nonwhite creatures.
-id=1602
-name=Angelic Voices
-rarity=R
-type=Enchantment
-mana={2}{W}{W}
-[/card]
+
 [card]
 text={G}{W}{U}, {T}: Prevent all combat damage that would be dealt this turn.
 id=1643
@@ -125,16 +118,7 @@ power=7
 subtype=Elder Dragon
 toughness=7
 [/card]
-[card]
-text=Legendary creatures don't untap during their controllers' untap steps. When Arena of the Ancients comes into play, tap all legendary creatures.
-id=1400
-name=Arena of the Ancients
-auto=tap all(creature[legendary])
-auto=lord(creature[legendary]) doesntuntap
-rarity=R
-type=Artifact
-mana={3}
-[/card]
+
 [card]
 text=Counter target instant or Aura spell that targets a permanent you control.
 id=1515
@@ -335,14 +319,6 @@ subtype=Horror
 toughness=7
 [/card]
 [card]
-text=Creatures with mountainwalk can be blocked as though they didn't have mountainwalk.
-id=1564
-name=Crevasse
-rarity=U
-type=Enchantment
-mana={2}{R}
-[/card]
-[card]
 text=When Cyclopean Mummy is put into a graveyard from play, remove Cyclopean Mummy from the game.
 id=1433
 name=Cyclopean Mummy
@@ -465,15 +441,6 @@ mana={W}
 subtype=Aura
 [/card]
 [card]
-text=Enchant creature     Enchanted creature has vigilance.
-id=1570
-name=Eternal Warrior
-rarity=U
-type=Enchantment
-mana={R}
-subtype=Aura
-[/card]
-[card]
 text=Starting with you, each player may put a permanent card from his or her hand into play. Repeat this process until no one puts a card into play.
 id=1525
 name=Eureka
@@ -660,14 +627,7 @@ rarity=U
 type=Enchantment
 mana={1}{W}
 [/card]
-[card]
-text={B}, Pay 2 life: Draw a card.
-id=1441
-name=Greed
-rarity=R
-type=Enchantment
-mana={3}{B}
-[/card]
+
 [card]
 text={2}, {T}: Put a charge counter on Green Mana Battery.       {T}, Remove any number of charge counters from Green Mana Battery: Add {G} to your mana pool, then add an additional {G} to your mana pool for each charge counter removed this way.
 id=1406
@@ -698,21 +658,7 @@ power=2
 subtype=Human Warrior
 toughness=4
 [/card]
-[card]
-text=Legendary     {T}: Add {R} to your mana pool.      {T}: Target creature loses all landwalk abilities until end of turn.
-auto={T}:Add {R}
-auto={T}:-plainswalk target(creature)
-auto={T}:-islandwalk target(creature)
-auto={T}:-swampwalk target(creature)
-auto={T}:-mountainwalk target(creature)
-auto={T}:-forestwalk target(creature) 
-id=1700
-name=Hammerheim
-color=Land
-rarity=U
-type=Land
-abilities=legendary
-[/card]
+
 [card]
 text=Any number of target creatures become white until end of turn.
 id=1617
@@ -721,14 +667,7 @@ rarity=U
 type=Instant
 mana={W}
 [/card]
-[card]
-text=Destroy all nonblack creatures. Hellfire deals X plus 3 damage to you, where X is the number of creatures put into all graveyards this way.
-id=1445
-name=Hellfire
-rarity=R
-type=Sorcery
-mana={2}{B}{B}{B}
-[/card]
+
 [card]
 text=Prevent all combat damage that would be dealt this turn.
 id=1618
@@ -872,17 +811,6 @@ subtype=Human Cleric
 toughness=2
 [/card]
 [card]
-text=
-id=1667
-name=Lady Orca
-rarity=U
-type=Legendary Creature
-mana={5}{B}{R}
-power=7
-subtype=Demon
-toughness=4
-[/card]
-[card]
 text=If an opponent who controls at least as many lands as you do would put a land into play, that player instead puts that land into play then sacrifices a land.
 id=1490
 name=Land Equilibrium
@@ -1383,28 +1311,7 @@ rarity=U
 type=Instant
 mana={1}{U}
 [/card]
-[card]
-text=
-id=1684
-name=Sivitri Scarzam
-rarity=U
-type=Legendary Creature
-mana={5}{U}{B}
-power=6
-subtype=Human
-toughness=4
-[/card]
-[card]
-text=Swampwalk     Whenever a player plays a black spell, you gain 1 life.
-id=1685
-name=Sol'kanar the Swamp King
-rarity=R
-type=Legendary Creature
-mana={2}{U}{B}{R}
-power=5
-subtype=Demon
-toughness=5
-[/card]
+
 [card]
 text=Enchant creature     Enchanted creature has shroud as long as it's untapped. (It can't be the target of spells or abilities.)
 id=1504
@@ -1606,14 +1513,6 @@ rarity=U
 type=Land
 [/card]
 [card]
-text=Search your library for a basic land card and put that card into play. Then shuffle your library.
-id=1550
-name=Untamed Wilds
-rarity=U
-type=Sorcery
-mana={2}{G}
-[/card]
-[card]
 text=Flying     At the beginning of your upkeep, sacrifice Vaevictis Asmadi unless you pay {B}{R}{G}.     {B}: Vaevictis Asmadi gets +1/+0 until end of turn.     {R}: Vaevictis Asmadi gets +1/+0 until end of turn.     {G}: Vaevictis Asmadi gets +1/+0 until end of turn.
 id=1696
 name=Vaevictis Asmadi
diff --git a/projects/mtg/bin/Res/sets/RV/_cards.dat b/projects/mtg/bin/Res/sets/RV/_cards.dat
index 1272e01a6..a3122e33d 100644
--- a/projects/mtg/bin/Res/sets/RV/_cards.dat
+++ b/projects/mtg/bin/Res/sets/RV/_cards.dat
@@ -1507,6 +1507,18 @@ subtype=Golem
 toughness=6
 [/card]
 [card]
+text=When Onulet is put into a graveyard from play, you gain 2 life.
+auto=@movedTo(this|graveyard):life:2
+id=1130
+name=Onulet
+rarity=R
+color=Artifact
+type=Artifact Creature
+mana={3}
+power=2
+toughness=2
+[/card]
+[card]
 text={T}: Orcish Artillery deals 2 damage to target creature or player and 3 damage to you.
 id=1309
 name=Orcish Artillery
@@ -2259,6 +2271,19 @@ subtype=Troll
 toughness=2
 [/card]
 [card]
+text=Whenever you play an enchantment spell, you may draw a card.
+auto=@movedTo(enchantment|mystack):may draw:1
+id=1272
+name=Verduran Enchantress
+rarity=R
+color=Green
+type=Creature
+mana={1}{G}{G}
+power=0
+subtype=Human Druid
+toughness=2
+[/card]
+[card]
 text=Destroy X target Mountains. Volcanic Eruption deals damage to each creature and player equal to the number of Mountains destroyed this way.
 target=mountains
 id=1231
diff --git a/projects/mtg/bin/Res/sets/RV/todo.dat b/projects/mtg/bin/Res/sets/RV/todo.dat
index dfeff34f1..aa58da41f 100644
--- a/projects/mtg/bin/Res/sets/RV/todo.dat
+++ b/projects/mtg/bin/Res/sets/RV/todo.dat
@@ -243,6 +243,8 @@ mana={U}
 [/card]
 [card]
 text=Blue creatures don't untap during their controllers' untap steps.     Blue creatures have "At the beginning of your upkeep, you may pay {4}. If you do, untap this creature."
+auto=lord(creature[blue]) doesnotuntap
+auto=lord(creature[blue]) @each my upkeep:may {4}:untap
 id=1304
 name=Magnetic Mountain
 rarity=R
@@ -326,17 +328,7 @@ power=1
 subtype=Imp
 toughness=1
 [/card]
-[card]
-text=When Onulet is put into a graveyard from play, you gain 2 life.
-id=1130
-name=Onulet
-rarity=R
-color=Artifact
-type=Artifact Creature
-mana={3}
-power=2
-toughness=2
-[/card]
+
 [card]
 text={0}: The next 1 damage that would be dealt to Personal Incarnation this turn is dealt to its owner instead. Any player may play this ability, but only if he or she owns Personal Incarnation.     When Personal Incarnation is put into a graveyard from play, its owner loses half his or her life, rounded up.
 id=1357
@@ -519,18 +511,7 @@ color=Green
 type=Enchantment
 mana={3}{G}
 [/card]
-[card]
-text=Whenever you play an enchantment spell, you may draw a card.
-id=1272
-name=Verduran Enchantress
-rarity=R
-color=Green
-type=Creature
-mana={1}{G}{G}
-power=0
-subtype=Human Druid
-toughness=2
-[/card]
+
 [card]
 text=As Vesuvan Doppelganger comes into play, you may choose a creature in play. If you do, Vesuvan Doppelganger comes into play as a copy of that creature except for its color and gains "At the beginning of your upkeep, you may have this creature become a copy of target creature except for its color. If you do, this creature gains this ability."
 id=1230