diff --git a/projects/mtg/bin/Res/sets/CHK/_cards.dat b/projects/mtg/bin/Res/sets/CHK/_cards.dat
index 08269abb0..912597986 100644
--- a/projects/mtg/bin/Res/sets/CHK/_cards.dat
+++ b/projects/mtg/bin/Res/sets/CHK/_cards.dat
@@ -13,7 +13,7 @@ toughness=1
 [/card]
 [card]
 text={R},{T}: Attacking creatures gain first strike until end of turn.
-id=159328
+id=50338
 name=Akki Coalflinger
 auto={R}{T}:lord(creature[attacking]) first strike
 rarity=U
@@ -64,7 +64,8 @@ mana={2}{B}{B}
 id=79248
 name=Ben-Ben, Akki Hermit
 mana={2}{R}{R}
-type=Legendary Creature
+type=Creature
+abilities=Legendary 
 subtype=Goblin Shaman
 power=1
 toughness=1
diff --git a/projects/mtg/bin/Res/sets/RAV/_cards.dat b/projects/mtg/bin/Res/sets/RAV/_cards.dat
index ebddfe140..195d0bcc0 100644
--- a/projects/mtg/bin/Res/sets/RAV/_cards.dat
+++ b/projects/mtg/bin/Res/sets/RAV/_cards.dat
@@ -120,6 +120,18 @@ toughness=5
 abilities=defender
 [/card]
 [card]
+text=({GW} can be paid with either {G} or {W}.)  When Centaur Safeguard is put into a graveyard from play, you may gain 3 life.
+id=87959
+auto=movedto(this|graveyard):may life:3
+name=Centaur Safeguard
+rarity=C
+type=Creature
+mana={2}{GW}
+power=3
+subtype=Centaur Warrior
+toughness=1
+[/card]
+[card]
 text=Char deals 4 damage to target creature or player and 2 damage to you.
 target=creature,player
 auto=Damage:4
@@ -179,6 +191,15 @@ toughness=2
 abilities=flying,vigilance
 [/card]
 [card]
+text={3}, {T}: Tap target creature, then return Cyclopean Snare to its owner's hand.
+id=89035
+auto={3}{T}:tap target(creature) && moveto(ownerhand)
+name=Cyclopean Snare
+rarity=U
+type=Artifact
+mana={2}
+[/card]
+[card]
 text=Sacrifice a forest: You gain 3 life.
 auto={S(forest|myinplay)}:life:3
 id=89017
@@ -213,6 +234,16 @@ toughness=2
 abilities=flying
 [/card]
 [card]
+text=Dogpile deals damage to target creature or player equal to the number of attacking creatures you control.
+id=87921
+target=creature,player
+auto=foreach(creature[attacking]|myinplay):damage:1
+name=Dogpile
+rarity=C
+type=Instant
+mana={3}{R}
+[/card]
+[card]
 text={2}{G}, {T}: Return target enchantment card from your graveyard to your hand.
 id=88968
 name=Dowsing Shaman
@@ -273,6 +304,15 @@ power=1
 toughness=1
 [/card]
 [card]
+text=Each player returns all creature cards from his or her graveyard to his or her hand.
+id=89015
+name=Empty the Catacombs
+auto=moveto(ownerHand) all(creature|Graveyard)
+rarity=R
+type=Sorcery
+mana={3}{B}
+[/card]
+[card]
 text=Search your library for a Plains, Island, Swamp, or Mountain card and put it into play tapped. Then shuffle your library.
 id=87970
 name=Farseek
@@ -296,6 +336,15 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+text=Until end of turn, permanents you control gain "{T}: This permanent deals 1 damage to target creature or player."
+id=83912
+auto=lord(creature|myinplay) {T}:damage:1 target(*)
+name=Flame Fusillade
+rarity=R
+type=Sorcery
+mana={3}{R}
+[/card]
+[card]
 text=Enchant creature    When Flight of Fancy comes into play, draw two cards.      Enchanted creature has flying.
 target=creature
 auto=draw:2
@@ -388,6 +437,19 @@ toughness=2
 abilities=mountainwalk
 [/card]
 [card]
+text=({BG} can be paid with either {B} or {G}.)  {4}{B}, Sacrifice a creature: Return target creature card from your graveyard to your hand.     {4}{G}: Put a +1/+1 counter on target creature.
+id=83838
+auto={4}{B}{S(creature|myinplay)}:moveto(myhand) target(creature|mygraveyard)
+auto={4}{G}:counter(1/1) target(creature)
+name=Golgari Guildmage
+rarity=U
+type=Creature
+mana={BG}{BG}
+power=2
+subtype=Elf Shaman
+toughness=2
+[/card]
+[card]
 text={B}, Sacrifice a creature: Target player loses 1 life.
 id=89038
 auto={B}{S(creature|myinplay)}:life:-1 target(player)
@@ -449,6 +511,18 @@ power=3
 toughness=4
 [/card]
 [card]
+text=When Infectious Host is put into a graveyard from play, target player loses 2 life.
+id=87966
+auto=@movedto(this|graveyard):damage:2 target(player)
+name=Infectious Host
+rarity=C
+type=Creature
+mana={2}{B}
+power=1
+subtype=Zombie
+toughness=1
+[/card]
+[card]
 text={T}: Add {U} to your mana pool.
 auto={T}:add {U}
 id=95113
@@ -765,6 +839,18 @@ mana={2}
 type=Artifact
 [/card]
 [card]
+text=When Sell-Sword Brute is put into a graveyard from play, it deals 2 damage to you.
+id=87909
+name=Sell-Sword Brute
+auto=@movedto(this|graveyard):damage:2
+rarity=C
+type=Creature
+mana={1}{R}
+power=2
+subtype=Human Mercenary
+toughness=2
+[/card]
+[card]
 text=Swampwalk        Sacrifice Sewerdreg: Remove target card in a graveyard from the game.
 id=88995
 name=Sewerdreg
@@ -831,6 +917,19 @@ power=1
 toughness=1
 [/card]
 [card]
+text=Whenever a land comes into play under your control, untap Stone-Seeder Hierophant.     {T}: Untap target land.
+id=89041
+auto=@movedto(land|myinplay):untap
+auto={T}:untap target(land)
+name=Stone-Seeder Hierophant
+rarity=C
+type=Creature
+mana={2}{G}{G}
+power=1
+subtype=Human Druid
+toughness=1
+[/card]
+[card]
 text={T}: Add {1} to your mana pool.     {2}{R}{W}, {T}: Target creature gains double strike until end of turn.
 id=83794
 auto={T}:add {1}
@@ -840,6 +939,18 @@ rarity=U
 type=Land
 [/card]
 [card]
+text=Flying     When Surveilling Sprite is put into a graveyard from play, you may draw a card.
+id=87904
+auto=@movedto(this|graveyard):may draw:1
+name=Surveilling Sprite
+rarity=C
+type=Creature
+mana={1}{U}
+power=1
+subtype=Faerie Rogue
+toughness=1
+[/card]
+[card]
 text={T}: Add {B} to your mana pool.
 auto={T}: Add {B}
 id=95114
diff --git a/projects/mtg/bin/Res/sets/RAV/todo.dat b/projects/mtg/bin/Res/sets/RAV/todo.dat
index c200676b0..c914a25a0 100644
--- a/projects/mtg/bin/Res/sets/RAV/todo.dat
+++ b/projects/mtg/bin/Res/sets/RAV/todo.dat
@@ -167,17 +167,6 @@ subtype=Human Cleric
 toughness=1
 [/card]
 [card]
-text=({GW} can be paid with either {G} or {W}.)  When Centaur Safeguard is put into a graveyard from play, you may gain 3 life.
-id=87959
-name=Centaur Safeguard
-rarity=C
-type=Creature
-mana={2}{GW}
-power=3
-subtype=Centaur Warrior
-toughness=1
-[/card]
-[card]
 text=Flying     {U}: Cerulean Sphinx's owner shuffles it into his or her library.
 id=89095
 name=Cerulean Sphinx
@@ -226,7 +215,6 @@ power=2
 subtype=Human Wizard
 toughness=3
 [/card]
-
 [card]
 text=Radiance - Cleansing Beam deals 2 damage to target creature and each other creature that shares a color with it.
 id=83567
@@ -272,6 +260,22 @@ mana={2}{U}
 [/card]
 [card]
 text=At the beginning of each upkeep, all creatures you control gain flying until end of turn if a creature you control has flying. The same is true for fear, first strike, double strike, landwalk, protection, trample, and vigilance.
+auto=@each upkeep:aslongas(creature[flying]|myinplay) lord(creature|myinplay)flying
+auto=@each upkeep:aslongas(creature[fear]|myinplay) lord(creature|myinplay)fear
+auto=@each upkeep:aslongas(creature[first strike]|myinplay) lord(creature|myinplay)first strike
+auto=@each upkeep:aslongas(creature[double strike]|myinplay) lord(creature|myinplay)double strike
+auto=@each upkeep:aslongas(creature[islandwalk]|myinplay) lord(creature|myinplay)islandwalk
+auto=@each upkeep:aslongas(creature[forestwalk]|myinplay) lord(creature|myinplay)forestwalk
+auto=@each upkeep:aslongas(creature[swampwalk]|myinplay) lord(creature|myinplay)swampwalk
+auto=@each upkeep:aslongas(creature[plainswalk]|myinplay) lord(creature|myinplay)plainswalk
+auto=@each upkeep:aslongas(creature[mountainwalk]|myinplay) lord(creature|myinplay)mountainwalk
+auto=@each upkeep:aslongas(creature[protection from blue]|myinplay) lord(creature|myinplay)protection from blue
+auto=@each upkeep:aslongas(creature[protection from green]|myinplay) lord(creature|myinplay)protection from green
+auto=@each upkeep:aslongas(creature[protection from black]|myinplay) lord(creature|myinplay)protection from black
+auto=@each upkeep:aslongas(creature[protection from white]|myinplay) lord(creature|myinplay)protection from white
+auto=@each upkeep:aslongas(creature[protection from red]|myinplay) lord(creature|myinplay)protection from red
+auto=@each upkeep:aslongas(creature[trample]|myinplay) lord(creature|myinplay)trample
+auto=@each upkeep:aslongas(creature[vigilance]|myinplay) lord(creature|myinplay)vigilance
 id=89109
 name=Concerted Effort
 rarity=R
@@ -342,14 +346,6 @@ type=Artifact
 mana={2}
 [/card]
 [card]
-text={3}, {T}: Tap target creature, then return Cyclopean Snare to its owner's hand.
-id=89035
-name=Cyclopean Snare
-rarity=U
-type=Artifact
-mana={2}
-[/card]
-[card]
 text=At the beginning of your upkeep, reveal the top card of your library and put that card into your hand. You lose life equal to its converted mana cost.
 id=83771
 name=Dark Confidant
@@ -463,14 +459,6 @@ type=Instant
 mana={U}
 [/card]
 [card]
-text=Dogpile deals damage to target creature or player equal to the number of attacking creatures you control.
-id=87921
-name=Dogpile
-rarity=C
-type=Instant
-mana={3}{R}
-[/card]
-[card]
 text=If an effect would put one or more tokens into play under your control, it puts twice that many of those tokens into play instead.     If an effect would place one or more counters on a permanent you control, it places twice that many of those counters on that permanent instead.
 id=89116
 name=Doubling Season
@@ -531,15 +519,6 @@ type=Instant
 mana={4}{G}{G}
 [/card]
 [card]
-text=Each player returns all creature cards from his or her graveyard to his or her hand.
-id=89015
-name=Empty the Catacombs
-auto=moveto(ownerHand) all(creature|Graveyard)
-rarity=R
-type=Sorcery
-mana={3}{B}
-[/card]
-[card]
 text={U}, {T}: Target creature is unblockable this turn.     Transmute {1}{U}{U} ({1}{U}{U}, Discard this card: Search your library for a card with the same converted mana cost as this card, reveal it, and put it into your hand. Then shuffle your library. Play only as a sorcery.)
 id=89023
 name=Ethereal Usher
@@ -607,14 +586,6 @@ subtype=Angel
 toughness=3
 [/card]
 [card]
-text=Until end of turn, permanents you control gain "{T}: This permanent deals 1 damage to target creature or player."
-id=83912
-name=Flame Fusillade
-rarity=R
-type=Sorcery
-mana={3}{R}
-[/card]
-[card]
 text=When Flame-Kin Zealot comes into play, creatures you control get +1/+1 and gain haste until end of turn.
 id=83562
 name=Flame-Kin Zealot
@@ -757,6 +728,7 @@ toughness=3
 [card]
 text=Whenever a nontoken creature you control is put into a graveyard from play, put a 1/1 green Saproling creature token into play.
 id=89069
+auto=@movedto(creature[-token]|graveyard) from(myinplay):token(Saproling,creature saproling, 1/1,green)
 name=Golgari Germination
 rarity=U
 type=Enchantment
@@ -774,17 +746,6 @@ subtype=Skeleton Troll
 toughness=0
 [/card]
 [card]
-text=({BG} can be paid with either {B} or {G}.)  {4}{B}, Sacrifice a creature: Return target creature card from your graveyard to your hand.     {4}{G}: Put a +1/+1 counter on target creature.
-id=83838
-name=Golgari Guildmage
-rarity=U
-type=Creature
-mana={BG}{BG}
-power=2
-subtype=Elf Shaman
-toughness=2
-[/card]
-[card]
 text=Golgari Rot Farm comes into play tapped.     When Golgari Rot Farm comes into play, return a land you control to its owner's hand.     {T}: Add {B}{G} to your mana pool.
 id=87939
 name=Golgari Rot Farm
@@ -986,17 +947,6 @@ type=Instant
 mana={2}{U}{U}
 [/card]
 [card]
-text=When Infectious Host is put into a graveyard from play, target player loses 2 life.
-id=87966
-name=Infectious Host
-rarity=C
-type=Creature
-mana={2}{B}
-power=1
-subtype=Zombie
-toughness=1
-[/card]
-[card]
 text=Enchant creature     Enchanted creature has "At the end of your turn, sacrifice this creature unless it attacked this turn."
 id=88997
 name=Instill Furor
@@ -1090,6 +1040,8 @@ toughness=3
 [/card]
 [card]
 text=When Loxodon Hierarch comes into play, you gain 4 life.     {G}{W}, Sacrifice Loxodon Hierarch: Regenerate each creature you control.
+auto=life:4
+auto={S}:regenerate all(creature|myinplay)
 id=83738
 name=Loxodon Hierarch
 rarity=R
@@ -1161,6 +1113,7 @@ mana={4}{R}
 text=Each player shuffles his or her graveyard into his or her library.
 id=88963
 name=Mnemonic Nexus
+auto=moveto(library) all(*|graveyard)
 rarity=U
 type=Instant
 mana={3}{U}
@@ -1205,38 +1158,6 @@ subtype=Insect
 toughness=1
 [/card]
 [card]
-text={T}: Add {R} to your mana pool.
-id=95096
-name=Mountain
-rarity=L
-type=Basic Land
-subtype=Mountain
-[/card]
-[card]
-text={T}: Add {R} to your mana pool.
-id=95102
-name=Mountain
-rarity=L
-type=Basic Land
-subtype=Mountain
-[/card]
-[card]
-text={T}: Add {R} to your mana pool.
-id=95104
-name=Mountain
-rarity=L
-type=Basic Land
-subtype=Mountain
-[/card]
-[card]
-text={T}: Add {R} to your mana pool.
-id=95109
-name=Mountain
-rarity=L
-type=Basic Land
-subtype=Mountain
-[/card]
-[card]
 text=Counter target instant or sorcery spell.     Transmute {1}{U}{U} ({1}{U}{U}, Discard this card: Search your library for a card with the same converted mana cost as this card, reveal it, and put it into your hand. Then shuffle your library. Play only as a sorcery.)
 id=88955
 name=Muddle the Mixture
@@ -1571,6 +1492,7 @@ mana={G}{W}
 [card]
 text={1}, {T}, Tap an untapped creature you control: Put a 1/1 green Saproling creature token into play.
 id=87936
+auto={1}{T}:tap (creature[-tapped]|myinplay) && token(Saproling,creature saproling, 1/1, green)
 name=Selesnya Evangel
 rarity=C
 type=Creature
@@ -1597,17 +1519,7 @@ name=Selesnya Sanctuary
 rarity=C
 type=Land
 [/card]
-[card]
-text=When Sell-Sword Brute is put into a graveyard from play, it deals 2 damage to you.
-id=87909
-name=Sell-Sword Brute
-rarity=C
-type=Creature
-mana={1}{R}
-power=2
-subtype=Human Mercenary
-toughness=2
-[/card]
+
 [card]
 text=({UB} can be paid with either {U} or {B}.)  Players can't search libraries this turn.     Draw a card.
 id=83827
@@ -1705,17 +1617,6 @@ subtype=Imp
 toughness=2
 [/card]
 [card]
-text=Whenever a land comes into play under your control, untap Stone-Seeder Hierophant.     {T}: Untap target land.
-id=89041
-name=Stone-Seeder Hierophant
-rarity=C
-type=Creature
-mana={2}{G}{G}
-power=1
-subtype=Human Druid
-toughness=1
-[/card]
-[card]
 text=At the end of each player's turn, that player sacrifices an untapped land.
 id=89105
 name=Stoneshaker Shaman
@@ -1780,17 +1681,6 @@ type=Instant
 mana={R}
 [/card]
 [card]
-text=Flying     When Surveilling Sprite is put into a graveyard from play, you may draw a card.
-id=87904
-name=Surveilling Sprite
-rarity=C
-type=Creature
-mana={1}{U}
-power=1
-subtype=Faerie Rogue
-toughness=1
-[/card]
-[card]
 text={T}: Add {1} to your mana pool.     {3}{B}{G}: Until end of turn, Svogthos, the Restless Tomb becomes a black and green Plant Zombie creature with "This creature's power and toughness are each equal to the number of creature cards in your graveyard." It's still a land.
 id=89045
 name=Svogthos, the Restless Tomb