diff --git a/projects/mtg/bin/Res/sets/ICE/_cards.dat b/projects/mtg/bin/Res/sets/ICE/_cards.dat
index 2d5b3e56d..323ba692b 100644
--- a/projects/mtg/bin/Res/sets/ICE/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ICE/_cards.dat
@@ -291,7 +291,7 @@ text=Tap target artifact, creature, or land. Draw a card at the beginning of the
 id=2503
 target=artifact,creature,land
 auto=tap 
-auto=@next upkeep:draw:1
+auto=@next upkeep:draw:1 controller
 name=Enervate
 rarity=C
 mana={1}{U}
diff --git a/projects/mtg/bin/Res/sets/LEG/_cards.dat b/projects/mtg/bin/Res/sets/LEG/_cards.dat
index 03fbaebc4..f53db19a6 100644
--- a/projects/mtg/bin/Res/sets/LEG/_cards.dat
+++ b/projects/mtg/bin/Res/sets/LEG/_cards.dat
@@ -8,6 +8,16 @@ mana={3}{U}
 type=Sorcery
 [/card]
 [card]
+text=Choose one - Destroy target blue permanent; or return target Island to its owner's hand.
+id=1556
+auto=may destroy target(*[blue])
+auto=may moveTo(ownerhand) target(island)
+name=Active Volcano
+rarity=C
+mana={R}
+type=Instant
+[/card]
+[card]
 text={B}{R}{G}, {T}: Return target creature card from your graveyard to your hand.
 auto={B}{R}{G}{T}:moveTo(myhand) target(creature|mygraveyard)
 id=1642
@@ -403,6 +413,16 @@ mana={1}{U}
 type=Instant
 [/card]
 [card]
+text=Choose one - Destroy target red permanent; or return target Mountain to its owner's hand.
+id=1483
+auto=may destroy target(*[red])
+auto=may moveTo(ownerhand) target(mountain)
+name=Flash Flood
+rarity=C
+mana={U}
+type=Instant
+[/card]
+[card]
 text=Rampage 2 (Whenever this creature becomes blocked, it gets +2/+2 until end of turn for each creature blocking it beyond the first.)
 id=1574
 name=Frost Giant
diff --git a/projects/mtg/bin/Res/sets/LEG/todo.dat b/projects/mtg/bin/Res/sets/LEG/todo.dat
index 6dbab38bf..2d759f3ae 100644
--- a/projects/mtg/bin/Res/sets/LEG/todo.dat
+++ b/projects/mtg/bin/Res/sets/LEG/todo.dat
@@ -10,14 +10,6 @@ subtype=Horror
 toughness=6
 [/card]
 [card]
-text=Choose one - Destroy target blue permanent; or return target Island to its owner's hand.
-id=1556
-name=Active Volcano
-rarity=C
-type=Instant
-mana={R}
-[/card]
-[card]
 text=Green legendary creatures you control have "bands with other legendary creatures."
 id=1698
 name=Adventurers' Guildhouse
@@ -482,14 +474,6 @@ subtype=Phoenix
 toughness=2
 [/card]
 [card]
-text=Choose one - Destroy target red permanent; or return target Mountain to its owner's hand.
-id=1483
-name=Flash Flood
-rarity=C
-type=Instant
-mana={U}
-[/card]
-[card]
 text=Whenever Floral Spuzzem attacks and isn't blocked, you may destroy target artifact defending player controls. If you do, Floral Spuzzem deals no combat damage this turn.
 id=1527
 name=Floral Spuzzem
diff --git a/projects/mtg/bin/Res/sets/NMS/_cards.dat b/projects/mtg/bin/Res/sets/NMS/_cards.dat
index ff58b82d0..0cd561bba 100644
--- a/projects/mtg/bin/Res/sets/NMS/_cards.dat
+++ b/projects/mtg/bin/Res/sets/NMS/_cards.dat
@@ -1,143 +1,220 @@
 [card]
-id=21285
-name=Accumulated Knowledge
-mana={1}{U}
-type=Instant
 text=Draw a card, then draw cards equal to the number of cards named Accumulated Knowledge in all graveyards.
+id=21285
 auto=draw:1
 auto=foreach(Accumulated Knowledge|graveyard) draw:1
+name=Accumulated Knowledge
 rarity=C
+mana={1}{U}
+type=Instant
 [/card]
 [card]
+text=Enchant creature   Enchanted creature has flying.   Enchanted creature can block only creatures with flying.
+id=22377
+target=creature
+auto=flying
+auto=cloud
+name=Air Bladder
+rarity=C
+mana={U}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
+text=Flying (This creature can't be blocked except by creatures with flying or reach.)   Other black creatures get +1/+1.   Nonblack creatures get -1/-1.
 id=22897
 name=Ascendant Evincar
+rarity=R
 mana={4}{B}{B}
 type=Creature
 subtype=Vampire
-power=3
-toughness=3
-text=Flying (This creature can't be blocked except by creatures with flying or reach.) Other black creatures get +1/+1.  Nonblack creatures get -1/-1.
-abilities=legendary,flying
 auto=lord(creature[black]) 1/1 other
 auto=lord(creature[-black]) -1/-1
-rarity=R
+power=3
+toughness=3
+abilities=legendary,flying
 [/card]
 [card]
+text=Flying   Battlefield Percher can block only creatures with flying. {1}{B}: Battlefield Percher gets +1/+1 until end of turn.
+id=21320
+name=Battlefield Percher
+rarity=U
+mana={3}{B}{B}
+type=Creature
+subtype=Bird
+auto={1}{B}:1/1
+power=2
+toughness=2
+abilities=flying,cloud
+[/card]
+[card]
+text=Flying   Belbe's Percher can block only creatures with flying.
+id=21308
+name=Belbe's Percher
+rarity=C
+mana={2}{B}
+type=Creature
+subtype=Bird
+power=2
+toughness=2
+abilities=flying,cloud
+[/card]
+[card]
+text={R}, {T}, Discard a card: Target creature can't block this turn.
+id=22060
+name=Bola Warrior
+rarity=C
+mana={1}{R}
+type=Creature
+subtype=Human Spellshaper Warrior
+auto={R}{T}{S(*|myhand)}:cantblock target(creature)
+power=1
+toughness=1
+[/card]
+[card]
+text=Defender (This creature can't attack.)   {1}{B}: Regenerate Carrion Wall.
 id=21319
 name=Carrion Wall
+rarity=U
 mana={1}{B}{B}
 type=Creature
 subtype=Wall
+auto={1}{B}:regenerate
 power=3
 toughness=2
-text=Defender (This creature can't attack.) {1}{B}: Regenerate Carrion Wall.
 abilities=defender
-auto={1}{B}:regenerate
-rarity=U
 [/card]
 [card]
+text=Coiling Woodworm's power is equal to the number of Forests on the battlefield.
 id=21364
 name=Coiling Woodworm
+rarity=U
 mana={2}{G}
 type=Creature
 subtype=Insect Worm
+auto=foreach(forest|battlefield) 1/0
 power=*
 toughness=1
-text=Coiling Woodworm's power is equal to the number of Forests on the battlefield.
-auto=foreach(forest|inplay) 1/0
-rarity=U
 [/card]
 [card]
-id=22290
-name=Flame Rift
-mana={1}{R}
-type=Sorcery
+text=When Death Pit Offering enters the battlefield, sacrifice all creatures you control.   Creatures you control get +2/+2.
+auto=bury all(creature|mybattlefield)
+auto=lord(creature|mybattlefield) 2/2
+id=21330
+name=Death Pit Offering
+rarity=R
+mana={2}{B}{B}
+type=Enchantment
+[/card]
+[card]
+text=Sacrifice a creature: Regenerate target creature.
+auto={S(creature|mybattlefield)}:regenerate target(creature)
+id=21260
+name=Fanatical Devotion
+rarity=C
+mana={2}{W}
+type=Enchantment
+[/card]
+[card]
 text=Flame Rift deals 4 damage to each player.
+id=22290
 auto=damage:4 opponent
 auto=damage:4 controller
+name=Flame Rift
 rarity=C
+mana={1}{R}
+type=Sorcery
 [/card]
 [card]
+text={R}: Flowstone Crusher gets +1/-1 until end of turn.
 id=21334
 name=Flowstone Crusher
+rarity=U
 mana={3}{R}{R}
 type=Creature
 subtype=Beast
+auto={R}:1/-1
 power=4
 toughness=4
-text={R}: Flowstone Crusher gets +1/-1 until end of turn.
-auto={R}:1/-1
-rarity=U
 [/card]
 [card]
+text={R}{R}: Target creature gets +1/-1 until end of turn.
 id=21351
 name=Flowstone Overseer
+rarity=R
 mana={2}{R}{R}{R}
 type=Creature
 subtype=Beast
+auto={R}{R}:1/-1 target(creature)
 power=4
 toughness=4
-text={R}{R}: Target creature gets +1/-1 until end of turn.
-auto={R}{R}:1/-1 target(creature)
-rarity=R
 [/card]
 [card]
-id=21341
-name=Flowstone Strike
-mana={1}{R}
-type=Instant
+text=All creatures get +X/-X until end of turn.
+auto=lord(creature) X/-X
+id=21355
+name=Flowstone Slide
+rarity=R
+mana={X}{2}{R}{R}
+type=Sorcery
+[/card]
+[card]
 text=Target creature gets +1/-1 and gains haste until end of turn.
+id=21341
 target=creature
 auto=haste
 auto=1/-1
+name=Flowstone Strike
 rarity=C
+mana={1}{R}
+type=Instant
 [/card]
 [card]
+text=Creatures you control get +1/-1.
+auto=lord(creature|myBattlefield) 1/-1
 id=21348
 name=Flowstone Surge
+rarity=U
 mana={1}{R}
 type=Enchantment
-text=Creatures you control get +1/-1.
-auto=lord(creature|myinplay) 1/-1
-rarity=U
 [/card]
 [card]
+text={1}: Flowstone Thopter gets +1/-1 and gains flying until end of turn.
 id=21398
 name=Flowstone Thopter
+rarity=U
 mana={7}
 type=Artifact Creature
 subtype=Thopter
+auto={1}:1/-1 && flying
 power=4
 toughness=4
-text={1}: Flowstone Thopter gets +1/-1 and gains flying until end of turn.
-auto={1}:1/-1 && flying
-rarity=U
 [/card]
 [card]
+text=Defender (This creature can't attack.)   {R}: Flowstone Wall gets +1/-1 until end of turn.
 id=21336
 name=Flowstone Wall
+rarity=C
 mana={2}{R}
 type=Creature
 subtype=Wall
+auto={R}:1/-1
 power=0
 toughness=6
-text=Defender (This creature can't attack.) {R}: Flowstone Wall gets +1/-1 until end of turn.
-auto={R}:1/-1
 abilities=defender
-rarity=C
 [/card]
 [card]
-id=21286
-name=Infiltrate
-mana={U}
-type=Instant
 text=Target creature is unblockable this turn.
+id=21286
 target=creature
 auto=unblockable
+name=Infiltrate
 rarity=C
+mana={U}
+type=Instant
 [/card]
 [card]
-text={T}: Add {1} to your mana pool.  {1}{W}, {T}: Prevent all combat damage that would be dealt by target attacking creature this turn.
+text={T}: Add {1} to your mana pool.   {1}{W}, {T}: Prevent all combat damage that would be dealt by target attacking creature this turn.
 id=21403
 name=Kor Haven
 auto={T}:Add {1}
@@ -147,304 +224,364 @@ type=Land
 abilities=legendary
 [/card]
 [card]
+text={T}, Sacrifice Lawbringer: Exile target red creature.
 id=21255
 name=Lawbringer
+rarity=C
 mana={2}{W}
 type=Creature
 subtype=Kor Rebel
+auto={T}{S}:moveTo(exile) target(creature[red])
 power=2
 toughness=2
-text={T}, Sacrifice Lawbringer: Exile target red creature.
-auto={T}{S}:moveTo(exile) target(creature[red])
-rarity=C
 [/card]
 [card]
+text={T}, Sacrifice Lightbringer: Exile target black creature.
 id=21256
 name=Lightbringer
+rarity=C
 mana={2}{W}
 type=Creature
 subtype=Kor Rebel
+auto={T}{S}:moveTo(exile) target(creature[black])
 power=2
 toughness=2
-text={T}, Sacrifice Lightbringer: Exile target black creature.
-auto={T}{S}:moveTo(exile) target(creature[black])
-rarity=C
 [/card]
 [card]
+text={3}, {T}: Search your library for a Goblin permanent card and put that card onto the battlefield. Then shuffle your library.
+auto={3}{T}:moveTo(myBattlefield) target(goblin[-instant;-sorcery]|mylibrary)
 id=21350
 name=Moggcatcher
+rarity=R
 mana={2}{R}{R}
 type=Creature
 subtype=Human Mercenary
 power=2
 toughness=2
-text={3}, {T}: Search your library for a Goblin permanent card and put that card onto the battlefield. Then shuffle your library.
-auto={3}{T}:moveTo(myinplay) target(Goblin[-instant;-sorcery]|mylibrary)
-rarity=R
 [/card]
 [card]
+text={W}, {T}, Discard a card: Target creature can't attack this turn.
 id=22027
 name=Netter en-Dal
+rarity=C
 mana={W}
 type=Creature
 subtype=Human Spellshaper
+auto={W}{T}{S(*|myhand)}:cantattack target(creature)
 power=1
 toughness=1
-text={W}, {T}, Discard a card: Target creature can't attack this turn.
-auto={W}{T}{S(*|myhand)}:cantattack target(creature)
-rarity=C
 [/card]
 [card]
+text=Target creature can't attack or block this turn.
+id=22032
+target=creature
+auto=cantattack
+auto=cantblock
+name=Off Balance
+rarity=C
+mana={W}
+type=Instant
+[/card]
+[card]
+text=Protection from red
 id=22293
 name=Oraxid
+rarity=C
 mana={3}{U}
 type=Creature
 subtype=Crab Beast
 power=2
 toughness=3
-text=Protection from red
 abilities=Protection from red
-rarity=C
 [/card]
 [card]
+text=When Phyrexian Driver enters the battlefield, all other Mercenary creatures get +1/+1 until end of turn.
+id=22379
+name=Phyrexian Driver
+rarity=C
+mana={2}{B}
+type=Creature
+subtype=Zombie Mercenary
+auto=lord(other mercenary|myBattlefield) 1/1 ueot
+power=1
+toughness=1
+[/card]
+[card]
+text={B}, {T}, Discard a card: Target creature gets -1/-1 until end of turn.
 id=19579
 name=Plague Witch
+rarity=C
 mana={1}{B}
 type=Creature
 subtype=Elf Spellshaper
+auto={B}{T}{S(*|myhand)}:-1/-1 target(creature)
 power=1
 toughness=1
-text={B}, {T}, Discard a card: Target creature gets -1/-1 until end of turn.
-auto={B}{T}{S(*|myhand)}:-1/-1 target(creature)
-rarity=C
 [/card]
 [card]
+text={2}: Target creature gains flying until end of turn.   {5}, {T}: Destroy target creature with flying.
 id=21400
-name=Predator, Flagship
-mana={5}
-type=Artifact
-text={2}: Target creature gains flying until end of turn.  {5}, {T}: Destroy target creature with flying.
 auto={2}:flying target(creature)
 auto={5}{T}:destroy target(creature[flying])
-abilities=Legendary
+name=Predator, Flagship
 rarity=R
+mana={5}
+type=Artifact
+abilities=legendary
 [/card]
 [card]
+text=At the beginning of each opponent's upkeep, Rackling deals X damage to that player, where X is 3 minus the number of cards in his or her hand.
+id=21396
+alias=1139
+name=Rackling
+rarity=U
+mana={4}
+type=Artifact Creature
+subtype=Construct
+power=2
+toughness=2
+[/card]
+[card]
+text={T}: Add {1} to your mana pool.   {4}, {T}, Sacrifice a land: Rath's Edge deals 1 damage to target creature or player.
+auto={T}:Add {1}
+auto={4}{T}{S(land|myBattlefield)}:damage:1 target(creature,player)
 id=21402
 name=Rath's Edge
-type=Land
-text={T}: Add {1} to your mana pool.  {4}, {T}, Sacrifice a land: Rath's Edge deals 1 damage to target creature or player.
-auto={T}:Add {1}
-auto={4}{T}{S(land|myinplay)}:damage:1 target(creature,player)
-abilities=legendary
 rarity=R
+type=Land
+abilities=legendary
 [/card]
 [card]
+text=Islandwalk (This creature is unblockable as long as defending player controls an Island.)
 id=22292
 name=Rootwater Commando
+rarity=C
 mana={2}{U}
 type=Creature
 subtype=Merfolk
 power=2
 toughness=2
-text=Islandwalk (This creature is unblockable as long as defending player controls an Island.)
 abilities=islandwalk
-rarity=C
 [/card]
 [card]
+text={3}, {T}: Search your library for a Merfolk permanent card and put that card onto the battlefield. Then shuffle your library.
+auto={3}{T}:moveTo(myBattlefield) target(merfolk[-sorcery;-instant]|mylibrary)
 id=21297
 name=Seahunter
+rarity=R
 mana={2}{U}{U}
 type=Creature
 subtype=Human Mercenary
 power=2
 toughness=2
-text={3}, {T}: Search your library for a Merfolk permanent card and put that card onto the battlefield. Then shuffle your library.
-auto={3}{T}:moveTo(myinplay) target(Merfolk[-sorcery;-instant]|mylibrary)
-rarity=R
 [/card]
 [card]
-id=21259
-name=Seal of Cleansing
-mana={1}{W}
-type=Enchantment
 text=Sacrifice Seal of Cleansing: Destroy target artifact or enchantment.
 auto={S}:destroy target(artifact,enchantment)
+id=21259
+name=Seal of Cleansing
 rarity=C
+mana={1}{W}
+type=Enchantment
 [/card]
 [card]
-id=21316
-name=Seal of Doom
-mana={2}{B}
-type=Enchantment
 text=Sacrifice Seal of Doom: Destroy target nonblack creature. It can't be regenerated.
 auto={S}:bury target(creature[-black])
+id=21316
+name=Seal of Doom
 rarity=C
+mana={2}{B}
+type=Enchantment
 [/card]
 [card]
-id=21340
-name=Seal of Fire
-mana={R}
-type=Enchantment
 text=Sacrifice Seal of Fire: Seal of Fire deals 2 damage to target creature or player.
 auto={S}:damage:2 target(creature,player)
+id=21340
+name=Seal of Fire
 rarity=C
+mana={R}
+type=Enchantment
 [/card]
 [card]
-id=21287
-name=Seal of Removal
-mana={U}
-type=Enchantment
 text=Sacrifice Seal of Removal: Return target creature to its owner's hand.
 auto={S}:moveTo(ownerhand) target(creature)
+id=21287
+name=Seal of Removal
 rarity=C
+mana={U}
+type=Enchantment
 [/card]
 [card]
-id=21366
-name=Seal of Strength
-mana={G}
-type=Enchantment
 text=Sacrifice Seal of Strength: Target creature gets +3/+3 until end of turn.
 auto={S}:3/3 target(creature)
+id=21366
+name=Seal of Strength
 rarity=C
+mana={G}
+type=Enchantment
 [/card]
 [card]
+text=Haste   When Shrieking Mogg enters the battlefield, tap all other creatures.
 id=21353
 name=Shrieking Mogg
+rarity=R
 mana={1}{R}
 type=Creature
 subtype=Goblin
+auto=tap all(creature) other
 power=1
 toughness=1
-text=Haste. When Shrieking Mogg enters the battlefield, tap all other creatures.
-auto=tap all(creature) other
 abilities=haste
-rarity=R
 [/card]
 [card]
+text={3}, {T}: Search your library for an Elf permanent card and put that card onto the battlefield. Then shuffle your library.
+auto={3}{T}:moveTo(myBattlefield) target(elf[-sorcery;-instant]|mylibrary)
 id=21379
 name=Skyshroud Poacher
+rarity=R
 mana={2}{G}{G}
 type=Creature
 subtype=Human Rebel
 power=2
 toughness=2
-text={3}, {T}: Search your library for an Elf permanent card and put that card onto the battlefield. Then shuffle your library.
-auto={3}{T}:moveTo(myinplay) target(elf[-sorcery;-instant]|mylibrary)
-rarity=R
 [/card]
 [card]
+text={3}{U}: Return Sliptide Serpent to its owner's hand.
 id=21283
 name=Sliptide Serpent
+rarity=R
 mana={4}{U}{U}
 type=Creature
 subtype=Serpent
+auto={3}{U}:moveTo(ownerhand)
 power=4
 toughness=4
-text={3}{U}: Return Sliptide Serpent to its owner's hand.
-auto={3}{U}:moveTo(ownerhand)
-rarity=R
 [/card]
 [card]
+text=Spineless Thug can't block.
 id=21310
 name=Spineless Thug
+rarity=C
 mana={1}{B}
 type=Creature
 subtype=Zombie Mercenary
 power=2
 toughness=2
-text=Spineless Thug can't block.
 abilities=cantblock
-rarity=C
 [/card]
 [card]
+text={1}{G}, {T}, Discard a card: Creatures you control get +1/+1 and gain trample until end of turn.
+auto={1}{G}{T}{S(*|myhand)}:lord(creature|myBattlefield) 1/1 && lord(creature|mybattlefield) trample
 id=21359
 name=Stampede Driver
+rarity=U
 mana={G}
 type=Creature
 subtype=Human Spellshaper
 power=1
 toughness=1
-text={1}{G}, {T}, Discard a card: Creatures you control get +1/+1 and gain trample until end of turn.
-auto={1}{G}{T}{S(*|myhand)}:lord(creature|myinplay) 1/1 && lord(creature|myinplay) trample
-rarity=U
 [/card]
 [card]
-id=21298
-name=Stronghold Biologist
-mana={2}{U}
-type=Creature
-subtype=Human Spellshaper
-power=1
-toughness=1
 text={U}{U}, {T}, Discard a card: Counter target creature spell.
 auto={U}{U}{T}{S(*|myhand)}:fizzle target(creature|stack)
+id=21298
+name=Stronghold Biologist
 rarity=U
-[/card]
-[card]
-id=22374
-name=Stronghold Discipline
-mana={2}{B}{B}
-type=Sorcery
-text=Each player loses 1 life for each creature he or she controls.
-auto=foreach(creature|myinplay) life:-1 controller
-auto=foreach(creature|opponentinplay) life:-1 opponent
-rarity=U
-[/card]
-[card]
-id=22033
-name=Stronghold Machinist
 mana={2}{U}
 type=Creature
 subtype=Human Spellshaper
 power=1
 toughness=1
+rarity=U
+[/card]
+[card]
+text=Each player loses 1 life for each creature he or she controls.
+auto=foreach(creature|myBattlefield) life:-1 controller
+auto=foreach(creature|opponentBattlefield) life:-1 opponent
+id=22374
+name=Stronghold Discipline
+rarity=U
+mana={2}{B}{B}
+type=Sorcery
+[/card]
+[card]
 text={U}{U}, {T}, Discard a card: Counter target noncreature spell.
 auto={U}{U}{T}{S(*|myhand)}:fizzle target(*[-creature]|stack)
+id=22033
+name=Stronghold Machinist
 rarity=U
+mana={2}{U}
+type=Creature
+subtype=Human Spellshaper
+power=1
+toughness=1
 [/card]
 [card]
+text=Flying   Stronghold Zeppelin can block only creatures with flying.
+id=22880
+name=Stronghold Zeppelin
+rarity=U
+mana={2}{U}{U}
+type=Creature
+subtype=Human
+power=3
+toughness=3
+abilities=flying,cloud
+[/card]
+[card]
+text={T}: Add {1} to your mana pool.   {2}, {T}: You may put a basic land card from your hand onto the battlefield tapped.
+auto={T}:Add {1}
+auto={2}{T}:moveTo(myBattlefield) target(land[basic]|myhand) &&tap
 id=21394
 name=Terrain Generator
-type=Land
-text={T}: Add {1} to your mana pool. {2}, {T}: You may put a basic land card from your hand onto the battlefield tapped.
-auto={T}:Add {1}
-auto={2}{T}:moveTo(myinplay) target(land[basic]|myhand)
 rarity=U
+type=Land
 [/card]
 [card]
+text={U}, {T}, Discard a card: You may tap or untap target artifact, creature, or land.
+auto={U}{T}{S(*|myhand)}:tap target(artifact,creature,land)
+auto={U}{T}{S(*|myhand)}:untap target(artifact,creature,land)
 id=21278
 name=Trickster Mage
+rarity=C
 mana={U}
 type=Creature
 subtype=Human Spellshaper
 power=1
 toughness=1
-text={U}, {T}, Discard a card: You may tap or untap target artifact, creature, or land.
-auto={U}{T}{S(*|myhand)}:tap target(artifact,creature,land)
-auto={U}{T}{S(*|myhand)}:untap target(artifact,creature,land)
-rarity=C
 [/card]
 [card]
-id=21317
-name=Vicious Hunger
-mana={B}{B}
-type=Sorcery
 text=Vicious Hunger deals 2 damage to target creature and you gain 2 life.
+id=21317
 target=creature
 auto=damage:2
 auto=life:2 controller
+name=Vicious Hunger
 rarity=C
+mana={B}{B}
+type=Sorcery
 [/card]
 [card]
+text=At the beginning of each opponent's upkeep, Viseling deals X damage to that player, where X is the number of cards in his or her hand minus 4.
+auto=@each opponent upkeep:foreach(*|opponenthand) damage:1 opponent >4
+id=21397
+name=Viseling
+rarity=U
+mana={4}
+type=Artifact Creature
+subtype=Construct
+power=2
+toughness=2
+[/card]
+[card]
+text=Flying, protection from white
 id=21265
 name=Voice of Truth
+rarity=U
 mana={3}{W}
 type=Creature
 subtype=Angel
 power=2
 toughness=2
-text=Flying, protection from white
 abilities=flying,protection from white
-rarity=U
-[/card]
+[/card]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/sets/NMS/todo.dat b/projects/mtg/bin/Res/sets/NMS/todo.dat
index fa8564b43..12dd38939 100644
--- a/projects/mtg/bin/Res/sets/NMS/todo.dat
+++ b/projects/mtg/bin/Res/sets/NMS/todo.dat
@@ -7,15 +7,6 @@ text=Whenever a player casts a creature spell, that player sacrifices a permanen
 rarity=R
 [/card]
 [card]
-id=22377
-name=Air Bladder
-mana={U}
-type=Enchantment
-subtype=Aura
-text=Enchant creature Enchanted creature has flying. Enchanted creature can block only creatures with flying.
-rarity=C
-[/card]
-[card]
 id=22296
 name=Ancient Hydra
 mana={4}{R}
@@ -53,7 +44,6 @@ toughness=2
 text={2}{R}, {T}, Discard a card: Arc Mage deals 2 damage divided as you choose among any number of target creatures and/or players.
 rarity=U
 [/card]
-
 [card]
 id=21263
 name=Avenger en-Dal
@@ -66,17 +56,6 @@ text={2}{W}, {T}, Discard a card: Exile target attacking creature. Its controlle
 rarity=R
 [/card]
 [card]
-id=21320
-name=Battlefield Percher
-mana={3}{B}{B}
-type=Creature
-subtype=Bird
-power=2
-toughness=2
-text=Flying Battlefield Percher can block only creatures with flying. {1}{B}: Battlefield Percher gets +1/+1 until end of turn.
-rarity=U
-[/card]
-[card]
 id=21390
 name=Belbe's Armor
 mana={3}
@@ -85,17 +64,6 @@ text={X}, {T}: Target creature gets -X/+X until end of turn.
 rarity=U
 [/card]
 [card]
-id=21308
-name=Belbe's Percher
-mana={2}{B}
-type=Creature
-subtype=Bird
-power=2
-toughness=2
-text=Flying Belbe's Percher can block only creatures with flying.
-rarity=C
-[/card]
-[card]
 id=21401
 name=Belbe's Portal
 mana={5}
@@ -125,18 +93,6 @@ toughness=4
 text=Flying (This creature can't be blocked except by creatures with flying or reach.) Whenever Blinding Angel deals combat damage to a player, that player skips his or her next combat phase.
 rarity=R
 [/card]
-[card]
-id=22060
-name=Bola Warrior
-mana={1}{R}
-type=Creature
-subtype=Human Spellshaper Warrior
-power=1
-toughness=1
-text={R}, {T}, Discard a card: Target creature can't block this turn.
-rarity=C
-[/card]
-
 [card]
 id=21264
 name=Chieftain en-Dal
@@ -159,7 +115,6 @@ toughness=2
 text=Flying Fading 3 (This creature enters the battlefield with three fade counters on it. At the beginning of your upkeep, remove a fade counter from it. If you can't, sacrifice it.)
 rarity=C
 [/card]
-
 [card]
 id=21395
 name=Complex Automaton
@@ -188,14 +143,6 @@ text=You may return an Island you control to its owner's hand rather than pay Da
 rarity=C
 [/card]
 [card]
-id=21330
-name=Death Pit Offering
-mana={2}{B}{B}
-type=Enchantment
-text=When Death Pit Offering enters the battlefield, sacrifice all creatures you control. Creatures you control get +2/+2.
-rarity=R
-[/card]
-[card]
 id=22026
 name=Defender en-Vec
 mana={3}{W}
@@ -271,15 +218,6 @@ type=Artifact
 text={3}, {T}, Sacrifice a creature: Reveal cards from the top of your library equal to the sacrificed creature's power. Put one into your hand and exile the rest.
 rarity=R
 [/card]
-[card]
-id=21260
-name=Fanatical Devotion
-mana={2}{W}
-type=Enchantment
-text=Sacrifice a creature: Regenerate target creature.
-rarity=C
-[/card]
-
 [card]
 id=22284
 name=Flint Golem
@@ -299,20 +237,6 @@ type=Artifact
 text=You may choose not to untap Flowstone Armor during your untap step. {3}, {T}: Target creature gets +1/-1 for as long as Flowstone Armor remains tapped.
 rarity=U
 [/card]
-
-
-[card]
-id=21355
-name=Flowstone Slide
-mana={X}{2}{R}{R}
-type=Sorcery
-text=All creatures get +X/-X until end of turn.
-rarity=R
-[/card]
-
-
-
-
 [card]
 id=21368
 name=Fog Patch
@@ -332,7 +256,6 @@ toughness=1
 text={G}, {T}, Discard a card: Until end of turn, if you tap a land for mana, it produces one mana of a color of your choice instead of any other type and amount.
 rarity=C
 [/card]
-
 [card]
 id=21281
 name=Jolting Merfolk
@@ -414,8 +337,6 @@ subtype=Aura
 text=If you control a Plains, you may tap an untapped creature you control rather than pay Lashknife's mana cost. Enchant creature Enchanted creature has first strike.
 rarity=C
 [/card]
-
-
 [card]
 id=21271
 name=Lin Sivvi, Defiant Hero
@@ -486,7 +407,6 @@ toughness=2
 text=Mogg Toady can't attack unless you control more creatures than defending player. Mogg Toady can't block unless you control more creatures than attacking player.
 rarity=C
 [/card]
-
 [card]
 id=21290
 name=Mossdog
@@ -517,7 +437,6 @@ toughness=3
 text=Trample When Nesting Wurm enters the battlefield, you may search your library for up to three cards named Nesting Wurm, reveal them, and put them into your hand. If you do, shuffle your library.
 rarity=U
 [/card]
-
 [card]
 id=21262
 name=Noble Stand
@@ -527,14 +446,6 @@ text=Whenever a creature you control blocks, you gain 2 life.
 rarity=U
 [/card]
 [card]
-id=22032
-name=Off Balance
-mana={W}
-type=Instant
-text=Target creature can't attack or block this turn.
-rarity=C
-[/card]
-[card]
 id=22030
 name=Oracle's Attendants
 mana={3}{W}
@@ -545,7 +456,6 @@ toughness=5
 text={T}: All damage that would be dealt to target creature this turn by a source of your choice is dealt to Oracle's Attendants instead.
 rarity=R
 [/card]
-
 [card]
 id=22061
 name=Overlaid Terrain
@@ -612,17 +522,6 @@ text=Fading 5 (This enchantment enters the battlefield with five fade counters o
 rarity=R
 [/card]
 [card]
-id=22379
-name=Phyrexian Driver
-mana={2}{B}
-type=Creature
-subtype=Zombie Mercenary
-power=1
-toughness=1
-text=When Phyrexian Driver enters the battlefield, all other Mercenary creatures get +1/+1 until end of turn.
-rarity=C
-[/card]
-[card]
 id=22029
 name=Phyrexian Prowler
 mana={3}{B}
@@ -633,19 +532,6 @@ toughness=3
 text=Fading 3 (This creature enters the battlefield with three fade counters on it. At the beginning of your upkeep, remove a fade counter from it. If you can't, sacrifice it.) Remove a fade counter from Phyrexian Prowler: Phyrexian Prowler gets +1/+1 until end of turn.
 rarity=U
 [/card]
-
-
-[card]
-id=21396
-name=Rackling
-mana={4}
-type=Artifact Creature
-subtype=Construct
-power=2
-toughness=2
-text=At the beginning of each opponent's upkeep, Rackling deals X damage to that player, where X is 3 minus the number of cards in his or her hand.
-rarity=U
-[/card]
 [card]
 id=22890
 name=Rathi Assassin
@@ -679,7 +565,6 @@ toughness=1
 text=Fear (This creature can't be blocked except by artifact creatures and/or black creatures.) {2}, {T}: Search your library for a Mercenary permanent card with converted mana cost 2 or less and put that card onto the battlefield. Then shuffle your library.
 rarity=C
 [/card]
-
 [card]
 id=21378
 name=Refreshing Rain
@@ -723,7 +608,6 @@ type=Enchantment
 text=Lands don't untap during their controllers' untap steps.  At the beginning of each player's upkeep, that player untaps a land he or she controls.
 rarity=R
 [/card]
-
 [card]
 id=22889
 name=Rootwater Thief
@@ -770,13 +654,6 @@ type=Enchantment
 text={1}, Discard a card: Put a 1/1 green Saproling creature token onto the battlefield. Any player may activate this ability.
 rarity=R
 [/card]
-
-
-
-
-
-
-
 [card]
 id=22320
 name=Silkenfist Fighter
@@ -845,7 +722,6 @@ toughness=2
 text=If you control a Forest, you may have each other player gain 5 life rather than pay Skyshroud Cutter's mana cost.
 rarity=C
 [/card]
-
 [card]
 id=21360
 name=Skyshroud Ridgeback
@@ -868,7 +744,6 @@ toughness=1
 text=When Skyshroud Sentinel enters the battlefield, you may search your library for up to three cards named Skyshroud Sentinel, reveal them, and put them into your hand. If you do, shuffle your library.
 rarity=C
 [/card]
-
 [card]
 id=21282
 name=Sneaky Homunculus
@@ -880,7 +755,6 @@ toughness=1
 text=Sneaky Homunculus can't block or be blocked by creatures with power 2 or greater.
 rarity=C
 [/card]
-
 [card]
 id=21277
 name=Spiritual Asylum
@@ -900,9 +774,6 @@ toughness=3
 text=At the beginning of your upkeep, Spiteful Bully deals 3 damage to target creature you control.
 rarity=C
 [/card]
-
-
-
 [card]
 id=21357
 name=Stronghold Gambit
@@ -911,18 +782,6 @@ type=Sorcery
 text=Each player chooses a card in his or her hand. Then each player reveals his or her chosen card. The owner of the creature card revealed this way with the lowest converted mana cost puts that card onto the battlefield. If two or more creature cards are tied for lowest cost, those cards are put onto the battlefield.
 rarity=R
 [/card]
-
-[card]
-id=22880
-name=Stronghold Zeppelin
-mana={2}{U}{U}
-type=Creature
-subtype=Human
-power=3
-toughness=3
-text=Flying Stronghold Zeppelin can block only creatures with flying.
-rarity=U
-[/card]
 [card]
 id=21296
 name=Submerge
@@ -939,7 +798,6 @@ type=Artifact
 text=Fading 4 (This artifact enters the battlefield with four fade counters on it. At the beginning of your upkeep, remove a fade counter from it. If you can't, sacrifice it.) At the beginning of each player's upkeep, that player taps an untapped artifact, creature, or land he or she controls for each fade counter on Tangle Wire.
 rarity=R
 [/card]
-
 [card]
 id=21268
 name=Topple
@@ -957,20 +815,6 @@ subtype=Aura
 text=Enchant creature (Target a creature as you cast this. This card enters the battlefield attached to that creature.) Enchanted creature gets +1/+1 and can't be blocked except by creatures with flying.
 rarity=C
 [/card]
-
-
-[card]
-id=21397
-name=Viseling
-mana={4}
-type=Artifact Creature
-subtype=Construct
-power=2
-toughness=2
-text=At the beginning of each opponent's upkeep, Viseling deals X damage to that player, where X is the number of cards in his or her hand minus 4.
-rarity=U
-[/card]
-
 [card]
 id=21328
 name=Volrath the Fallen
@@ -1014,4 +858,4 @@ power=4
 toughness=6
 text=Fading 3 (This creature enters the battlefield with three fade counters on it. At the beginning of your upkeep, remove a fade counter from it. If you can't, sacrifice it.) {1}, Remove a fade counter from Woodripper: Destroy target artifact.
 rarity=U
-[/card]
+[/card]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/sets/P02/_cards.dat b/projects/mtg/bin/Res/sets/P02/_cards.dat
index b8c0a7a39..7f70157b4 100644
--- a/projects/mtg/bin/Res/sets/P02/_cards.dat
+++ b/projects/mtg/bin/Res/sets/P02/_cards.dat
@@ -703,6 +703,17 @@ toughness=3
 rarity=C
 [/card]
 [card]
+text=Destroy target creature. Its owner gains 4 life.
+id=6502
+target=creature
+auto=destroy
+auto=life:4 targetController
+name=Path of Peace
+rarity=C
+mana={3}{W}
+type=Sorcery
+[/card]
+[card]
 id=8374
 name=Plains
 auto={T}:Add{W}
diff --git a/projects/mtg/bin/Res/sets/P02/todo.dat b/projects/mtg/bin/Res/sets/P02/todo.dat
index 6ccbaa110..61bf370ce 100644
--- a/projects/mtg/bin/Res/sets/P02/todo.dat
+++ b/projects/mtg/bin/Res/sets/P02/todo.dat
@@ -9,7 +9,6 @@ toughness=2
 text=Whenever Abyssal Nightstalker attacks and isn't blocked, defending player discards a card.
 rarity=U
 [/card]
-
 [card]
 id=6506
 name=Alaborn Cavalier
@@ -21,9 +20,6 @@ toughness=2
 text=Whenever Alaborn Cavalier attacks, you may tap target creature.
 rarity=U
 [/card]
-
-
-
 [card]
 id=6516
 name=Alaborn Veteran
@@ -54,7 +50,6 @@ type=Sorcery
 text=All creatures able to block target creature this turn do so.
 rarity=R
 [/card]
-
 [card]
 id=6515
 name=Angel of Fury
@@ -66,7 +61,6 @@ toughness=5
 text=Flying When Angel of Fury is put into your graveyard from the battlefield, you may shuffle it into your library.
 rarity=R
 [/card]
-
 [card]
 id=6535
 name=Apprentice Sorcerer
@@ -78,20 +72,6 @@ toughness=1
 text={T}: Apprentice Sorcerer deals 1 damage to target creature or player. Activate this ability only during your turn, before attackers are declared.
 rarity=U
 [/card]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 [card]
 id=6544
 name=Coastal Wizard
@@ -130,11 +110,6 @@ toughness=4
 text=If Cunning Giant is unblocked, you may have it assign its combat damage to a creature defending player controls.
 rarity=R
 [/card]
-
-
-
-
-
 [card]
 id=6637
 name=Deathcoil Wurm
@@ -154,9 +129,6 @@ type=Instant
 text=Cast Deep Wood only during the declare attackers step and only if you've been attacked this step. Prevent all damage that would be dealt to you this turn by attacking creatures.
 rarity=U
 [/card]
-
-
-
 [card]
 id=6549
 name=Exhaustion
@@ -165,7 +137,6 @@ type=Sorcery
 text=Creatures and lands target opponent controls don't untap during his or her next untap step.
 rarity=U
 [/card]
-
 [card]
 id=6538
 name=Eye Spy
@@ -174,9 +145,6 @@ type=Sorcery
 text=Look at the top card of target player's library. You may put that card into his or her graveyard.
 rarity=U
 [/card]
-
-
-
 [card]
 id=6568
 name=Foul Spirit
@@ -188,7 +156,6 @@ toughness=2
 text=Flying When Foul Spirit enters the battlefield, sacrifice a land.
 rarity=U
 [/card]
-
 [card]
 id=6598
 name=Goblin Firestarter
@@ -211,12 +178,6 @@ toughness=1
 text=Whenever Goblin General attacks, Goblin creatures you control get +1/+1 until end of turn.
 rarity=U
 [/card]
-
-
-
-
-
-
 [card]
 id=6603
 name=Goblin War Cry
@@ -225,9 +186,6 @@ type=Sorcery
 text=Target opponent chooses a creature he or she controls. Other creatures he or she controls can't block this turn.
 rarity=U
 [/card]
-
-
-
 [card]
 id=6632
 name=Harmony of Nature
@@ -247,7 +205,6 @@ toughness=4
 text=When Hidden Horror enters the battlefield, sacrifice it unless you discard a creature card.
 rarity=U
 [/card]
-
 [card]
 id=6628
 name=Ironhoof Ox
@@ -259,7 +216,6 @@ toughness=4
 text=Ironhoof Ox can't be blocked by more than one creature.
 rarity=U
 [/card]
-
 [card]
 id=6601
 name=Jagged Lightning
@@ -268,9 +224,6 @@ type=Sorcery
 text=Jagged Lightning deals 3 damage to target creature and 3 damage to another target creature.
 rarity=U
 [/card]
-
-
-
 [card]
 id=6614
 name=Lone Wolf
@@ -293,8 +246,6 @@ toughness=1
 text=Whenever Lurking Nightstalker attacks, it gets +2/+0 until end of turn.
 rarity=C
 [/card]
-
-
 [card]
 id=6562
 #No Discard unless random
@@ -304,17 +255,6 @@ type=Sorcery
 text=Target player discards two cards.
 rarity=C
 [/card]
-
-
-
-
-
-
-
-
-
-
-
 [card]
 id=6615
 name=Norwood Riders
@@ -337,7 +277,6 @@ toughness=2
 text=Whenever Norwood Warrior becomes blocked, it gets +1/+1 until end of turn.
 rarity=C
 [/card]
-
 [card]
 id=6595
 name=Ogre Arsonist
@@ -349,18 +288,6 @@ toughness=3
 text=When Ogre Arsonist enters the battlefield, destroy target land.
 rarity=U
 [/card]
-
-
-
-[card]
-id=6502
-name=Path of Peace
-mana={3}{W}
-type=Sorcery
-text=Destroy target creature. Its owner gains 4 life.
-#cant target owner right now...
-rarity=C
-[/card]
 [card]
 id=6550
 name=Piracy
@@ -369,8 +296,6 @@ type=Sorcery
 text=Until end of turn, you may tap lands you don't control for mana. Spend this mana only to cast spells.
 rarity=R
 [/card]
-
-
 [card]
 id=6565
 name=Predatory Nightstalker
@@ -393,10 +318,6 @@ toughness=2
 text=Prowling Nightstalker can't be blocked except by black creatures.
 rarity=C
 [/card]
-
-
-
-
 [card]
 id=6511
 name=Rally the Troops
@@ -435,7 +356,6 @@ type=Sorcery
 text=Untap all creatures that attacked this turn. After this main phase, there is an additional combat phase followed by an additional main phase.
 rarity=R
 [/card]
-
 [card]
 id=6629
 name=Renewing Touch
@@ -444,11 +364,6 @@ type=Sorcery
 text=Shuffle any number of target creature cards from your graveyard into your library.
 rarity=U
 [/card]
-
-
-
-
-
 [card]
 id=6523
 name=Screeching Drake
@@ -479,12 +394,6 @@ type=Sorcery
 text=Look at the top two cards of your library. Put one of them into your hand and the other on the bottom of your library.
 rarity=C
 [/card]
-
-
-
-
-
-
 [card]
 id=8905
 name=Sylvan Basilisk
@@ -496,8 +405,6 @@ toughness=4
 text=Whenever Sylvan Basilisk becomes blocked by a creature, destroy that creature.
 rarity=U
 [/card]
-
-
 [card]
 id=6522
 name=Talas Explorer
@@ -509,12 +416,6 @@ toughness=1
 text=Flying When Talas Explorer enters the battlefield, look at target opponent's hand.
 rarity=C
 [/card]
-
-
-
-
-
-
 [card]
 id=6548
 name=Temporal Manipulation
@@ -523,7 +424,6 @@ type=Sorcery
 text=Take an extra turn after this one.
 rarity=R
 [/card]
-
 [card]
 id=6531
 name=Tidal Surge
@@ -532,8 +432,6 @@ type=Sorcery
 text=Tap up to three target creatures without flying.
 rarity=C
 [/card]
-
-
 [card]
 id=6494
 name=Town Sentry
@@ -545,9 +443,6 @@ toughness=2
 text=Whenever Town Sentry blocks, it gets +0/+2 until end of turn.
 rarity=C
 [/card]
-
-
-
 [card]
 id=6540
 name=Undo
@@ -556,11 +451,6 @@ type=Sorcery
 text=Return two target creatures to their owners' hands.
 rarity=U
 [/card]
-
-
-
-
-
 [card]
 id=6512
 name=Warrior's Stand
@@ -569,8 +459,6 @@ type=Instant
 text=Cast Warrior's Stand only during the declare attackers step and only if you've been attacked this step. Creatures you control get +2/+2 until end of turn.
 rarity=U
 [/card]
-
-
 [card]
 id=6610
 name=Wildfire
@@ -586,4 +474,4 @@ mana={1}{U}
 type=Sorcery
 text=One or two target creatures gain flying until end of turn.
 rarity=U
-[/card]
+[/card]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/sets/POR/_cards.dat b/projects/mtg/bin/Res/sets/POR/_cards.dat
index 9d104e696..0cb31728e 100644
--- a/projects/mtg/bin/Res/sets/POR/_cards.dat
+++ b/projects/mtg/bin/Res/sets/POR/_cards.dat
@@ -1060,6 +1060,16 @@ type=Basic Land
 subtype=Plains
 [/card]
 [card]
+text=Each player draws X cards.
+id=4273
+auto=Draw:X controller
+auto=Draw:X opponent
+name=Prosperity
+rarity=R
+mana={X}{U}
+type=Sorcery
+[/card]
+[card]
 text=Pyroclasm deals 2 damage to each creature.
 id=4354
 auto=damage:2 all(creature)
diff --git a/projects/mtg/bin/Res/sets/POR/todo.dat b/projects/mtg/bin/Res/sets/POR/todo.dat
index 6ce3d555b..9ebd64ad8 100644
--- a/projects/mtg/bin/Res/sets/POR/todo.dat
+++ b/projects/mtg/bin/Res/sets/POR/todo.dat
@@ -360,14 +360,6 @@ subtype=Elemental
 toughness=8
 [/card]
 [card]
-text=Each player draws X cards.
-id=4273
-name=Prosperity
-rarity=R
-type=Sorcery
-mana={X}{U}
-[/card]
-[card]
 text=Destroy two target lands.
 id=4359
 name=Rain of Salt
diff --git a/projects/mtg/bin/Res/sets/RAV/_cards.dat b/projects/mtg/bin/Res/sets/RAV/_cards.dat
index 73565b0f4..832e955e7 100644
--- a/projects/mtg/bin/Res/sets/RAV/_cards.dat
+++ b/projects/mtg/bin/Res/sets/RAV/_cards.dat
@@ -41,6 +41,15 @@ toughness=6
 abilities=flying
 [/card]
 [card]
+text={1}{R}, Sacrifice Blockbuster: Blockbuster deals 3 damage to each tapped creature and each player.
+auto={1}{R}{S}:damage:3 all(creature[tapped]) && damage:3 all(player)
+id=87977
+name=Blockbuster
+rarity=U
+mana={3}{R}{R}
+type=Enchantment
+[/card]
+[card]
 text=({RW} can be paid with either {R} or {W}.) {1}{R}: Target creature gains haste until end of turn.   {1}{W}: Target creature gains first strike until end of turn.
 id=87918
 name=Boros Guildmage
diff --git a/projects/mtg/bin/Res/sets/RAV/todo.dat b/projects/mtg/bin/Res/sets/RAV/todo.dat
index 62b47bdb9..34557e319 100644
--- a/projects/mtg/bin/Res/sets/RAV/todo.dat
+++ b/projects/mtg/bin/Res/sets/RAV/todo.dat
@@ -66,16 +66,6 @@ subtype=Spirit
 toughness=4
 [/card]
 [card]
-#to test ?
-text={1}{R}, Sacrifice Blockbuster: Blockbuster deals 3 damage to each tapped creature and each player.
-id=87977
-auto={1}{R}{S}:damage:3 all(creature[tapped],player)
-name=Blockbuster
-rarity=U
-type=Enchantment
-mana={3}{R}{R}
-[/card]
-[card]
 text=Noncreature spells you play cost {2} less to play.     Whenever you play a noncreature spell, counter that spell unless you sacrifice a creature.
 id=89102
 name=Blood Funnel
diff --git a/projects/mtg/bin/Res/sets/SHM/_cards.dat b/projects/mtg/bin/Res/sets/SHM/_cards.dat
index 954615872..4526585b8 100644
--- a/projects/mtg/bin/Res/sets/SHM/_cards.dat
+++ b/projects/mtg/bin/Res/sets/SHM/_cards.dat
@@ -270,6 +270,19 @@ power=2
 toughness=2
 [/card]
 [card]
+text={T}: Add {G} to your mana pool.   Put a -1/-1 counter on Devoted Druid: Untap Devoted Druid.
+id=135500
+name=Devoted Druid
+rarity=C
+mana={1}{G}
+type=Creature
+subtype=Elf Druid
+auto={T}:Add {G}
+auto={0}:counter(-1/-1) && untap
+power=0
+toughness=2
+[/card]
+[card]
 text=You may put a green creature card from your hand onto the battlefield.
 id=154003
 target=creature[green]|myhand
@@ -725,6 +738,23 @@ toughness=5
 abilities=wither
 [/card]
 [card]
+text=Morselhoarder enters the battlefield with two -1/-1 counters on it.   Remove a -1/-1 counter from Morselhoarder: Add one mana of any color to your mana pool.
+id=159407
+name=Morselhoarder
+rarity=C
+mana={4}{RG}{RG}
+type=Creature
+subtype=Elemental
+auto=counter(-1/-1,2)
+auto={0}:counter(-1/-1,-1) && add{W}
+auto={0}:counter(-1/-1,-1) && add{U}
+auto={0}:counter(-1/-1,-1) && add{B}
+auto={0}:counter(-1/-1,-1) && add{R}
+auto={0}:counter(-1/-1,-1) && add{G}
+power=6
+toughness=4
+[/card]
+[card]
 text={T}: Add {R} to your mana pool.
 auto={T}:Add {R}
 id=157888
diff --git a/projects/mtg/bin/Res/sets/SHM/todo.dat b/projects/mtg/bin/Res/sets/SHM/todo.dat
index b25e6708e..379ea3617 100644
--- a/projects/mtg/bin/Res/sets/SHM/todo.dat
+++ b/projects/mtg/bin/Res/sets/SHM/todo.dat
@@ -263,17 +263,6 @@ subtype=Spirit Avatar
 toughness=6
 [/card]
 [card]
-text={T}: Add {G} to your mana pool.     Put a -1/-1 counter on Devoted Druid: Untap Devoted Druid.
-id=135500
-name=Devoted Druid
-rarity=C
-type=Creature
-mana={1}{G}
-power=0
-subtype=Elf Druid
-toughness=2
-[/card]
-[card]
 text=Put a 5/5 black and red Elemental creature token into play. Target opponent sacrifices a creature for each black creature you control, then sacrifices a land for each red creature you control.
 id=146733
 name=Din of the Fireherd
@@ -932,17 +921,6 @@ type=Land
 subtype=Island
 [/card]
 [card]
-text=Morselhoarder comes into play with two -1/-1 counters on it.     Remove a -1/-1 counter from Morselhoarder: Add one mana of any color to your mana pool.
-id=159407
-name=Morselhoarder
-rarity=C
-type=Creature
-mana={4}{RG}{RG}
-power=6
-subtype=Elemental
-toughness=4
-[/card]
-[card]
 text=If Mossbridge Troll would be destroyed, regenerate it.     Tap any number of untapped creatures you control other than Mossbridge Troll with total power 10 or greater: Mossbridge Troll gets +20/+20 until end of turn.
 id=146021
 name=Mossbridge Troll
diff --git a/projects/mtg/bin/Res/sets/VIS/_cards.dat b/projects/mtg/bin/Res/sets/VIS/_cards.dat
index b9a37c019..5529ab75f 100644
--- a/projects/mtg/bin/Res/sets/VIS/_cards.dat
+++ b/projects/mtg/bin/Res/sets/VIS/_cards.dat
@@ -327,14 +327,14 @@ power=0
 toughness=3
 [/card]
 [card]
-id=3647
-name=Prosperity
-mana={X}{U}
-type=Sorcery
 text=Each player draws X cards.
+id=3647
 auto=Draw:X controller
 auto=Draw:X opponent
+name=Prosperity
 rarity=U
+mana={X}{U}
+type=Sorcery
 [/card]
 [card]
 id=3625