diff --git a/projects/mtg/bin/Res/sets/FUT/_cards.dat b/projects/mtg/bin/Res/sets/FUT/_cards.dat
index b030773b7..760ca5f1c 100644
--- a/projects/mtg/bin/Res/sets/FUT/_cards.dat
+++ b/projects/mtg/bin/Res/sets/FUT/_cards.dat
@@ -189,7 +189,19 @@ rarity=R
 type=Land
 [/card]
 [card]
-text={T}: Add {1} to your mana pool. {T}: Add {R} or {G} to your mana pool. Each opponent gains 1 life.
+text={R}, Return Grinning Ignus to its owner's hand: Add {2}{R} to your mana pool. Play this ability only any time you could cast a sorcery.
+id=136040
+name=Grinning Ignus
+rarity=C
+mana={2}{R}
+type=Creature
+subtype=Elemental
+auto={R}:moveTo(ownerhand) && add{2}{R} asSorcery
+power=2
+toughness=2
+[/card]
+[card]
+text={T}: Add {1} to your mana pool.   {T}: Add {R} or {G} to your mana pool. Each opponent gains 1 life.
 id=130595
 name=Grove of the Burnwillows
 auto={T}:Add {1}
diff --git a/projects/mtg/bin/Res/sets/FUT/todo.dat b/projects/mtg/bin/Res/sets/FUT/todo.dat
index 477318676..4121050f1 100644
--- a/projects/mtg/bin/Res/sets/FUT/todo.dat
+++ b/projects/mtg/bin/Res/sets/FUT/todo.dat
@@ -397,17 +397,6 @@ text=Madness {1}{B} (If you discard this card, you may play it for its madness c
 rarity=C
 [/card]
 [card]
-id=136040
-name=Grinning Ignus
-mana={2}{R}
-type=Creature
-subtype=Elemental
-power=2
-toughness=2
-text={R}, Return Grinning Ignus to its owner's hand: Add {2}{R} to your mana pool. Play this ability only any time you could play a sorcery.
-rarity=C
-[/card]
-[card]
 id=130328
 name=Haze of Rage
 mana={1}{R}
diff --git a/projects/mtg/bin/Res/sets/INV/_cards.dat b/projects/mtg/bin/Res/sets/INV/_cards.dat
index 734df75e0..0235b6c6a 100644
--- a/projects/mtg/bin/Res/sets/INV/_cards.dat
+++ b/projects/mtg/bin/Res/sets/INV/_cards.dat
@@ -1701,6 +1701,16 @@ toughness=3
 abilities=forestwalk
 [/card]
 [card]
+text=At the beginning of your upkeep, target player loses 1 life.   Sacrifice Smoldering Tar: Smoldering Tar deals 4 damage to target creature. Activate this ability only any time you could cast a sorcery.
+id=23179
+name=Smoldering Tar
+auto=@each my upkeep:life:-1 opponent
+auto={S}:damage:4 target(creature) asSorcery
+rarity=U
+mana={2}{B}{R}
+type=Enchantment
+[/card]
+[card]
 text={2}: Target green or blue creature gets +0/+1 until end of turn.
 id=22950
 name=Spirit Weaver
diff --git a/projects/mtg/bin/Res/sets/INV/todo.dat b/projects/mtg/bin/Res/sets/INV/todo.dat
index 5020f22aa..c9f0f4740 100644
--- a/projects/mtg/bin/Res/sets/INV/todo.dat
+++ b/projects/mtg/bin/Res/sets/INV/todo.dat
@@ -1056,14 +1056,6 @@ subtype=Kavu
 toughness=2
 [/card]
 [card]
-text=At the beginning of your upkeep, target player loses 1 life.       Sacrifice Smoldering Tar: Smoldering Tar deals 4 damage to target creature. Play this ability only any time you could play a sorcery.
-id=23179
-name=Smoldering Tar
-rarity=U
-type=Enchantment
-mana={2}{B}{R}
-[/card]
-[card]
 text=Spend only black and/or red mana on X.     Soul Burn deals X damage to target creature or player. You gain life equal to the damage dealt, but not more than the amount of {B} spent on X, the player's life total before Soul Burn dealt damage, or the creature's toughness.
 id=23026
 name=Soul Burn
diff --git a/projects/mtg/bin/Res/sets/LGN/_cards.dat b/projects/mtg/bin/Res/sets/LGN/_cards.dat
index 3d00e0982..7c4185a58 100644
--- a/projects/mtg/bin/Res/sets/LGN/_cards.dat
+++ b/projects/mtg/bin/Res/sets/LGN/_cards.dat
@@ -138,6 +138,18 @@ power=1
 toughness=1
 [/card]
 [card]
+text={2}{B}, {T}, Sacrifice a Zombie: Destroy target non-Zombie creature. It can't be regenerated. Activate this ability only any time you could cast a sorcery.
+id=35249
+name=Deathmark Prelate
+rarity=U
+mana={3}{B}
+type=Creature
+subtype=Human Cleric
+auto={2}{B}{T}{S(zombie|myBattlefield)}:destroy target(creature[-zombie]) asSorcery
+power=2
+toughness=3
+[/card]
+[card]
 text=Trample
 id=39707
 name=Defiant Elf
diff --git a/projects/mtg/bin/Res/sets/LGN/todo.dat b/projects/mtg/bin/Res/sets/LGN/todo.dat
index f3bb3153f..d54966933 100644
--- a/projects/mtg/bin/Res/sets/LGN/todo.dat
+++ b/projects/mtg/bin/Res/sets/LGN/todo.dat
@@ -219,18 +219,6 @@ text=Amplify 1 (As this card enters the battlefield, put a +1/+1 counter on it f
 rarity=C
 [/card]
 [card]
-text={2}{B}, {T}, Sacrifice a Zombie: Destroy target non-Zombie creature. It can't be regenerated. Activate this ability only any time you could cast a sorcery.
-id=35249
-name=Deathmark Prelate
-rarity=U
-mana={3}{B}
-type=Creature
-subtype=Human Cleric
-auto={2}{B}{T}{S(zombie[-attacking;-blocking]|myBattlefield)}:destroy target(creature[-zombie]) myTurnOnly
-power=2
-toughness=3
-[/card]
-[card]
 id=44329
 name=Defender of the Order
 mana={3}{W}
diff --git a/projects/mtg/bin/Res/sets/MIR/_cards.dat b/projects/mtg/bin/Res/sets/MIR/_cards.dat
index a405cceed..d8d48c560 100644
--- a/projects/mtg/bin/Res/sets/MIR/_cards.dat
+++ b/projects/mtg/bin/Res/sets/MIR/_cards.dat
@@ -895,6 +895,18 @@ toughness=3
 abilities=flying,protection from black
 [/card]
 [card]
+text={B}, Sacrifice a Swamp: Put a +1/+1 counter on Mire Shade. Activate this ability only any time you could cast a sorcery.
+id=3300
+name=Mire Shade
+rarity=U
+mana={1}{B}
+type=Creature
+subtype=Shade
+auto={B}{S(swamp|myBattlefield)}:counter(1/1) asSorcery
+power=1
+toughness=1
+[/card]
+[card]
 text=Moss Diamond enters the battlefield tapped.   {T}: Add {G} to your mana pool. 
 id=3260 
 name=Moss Diamond
diff --git a/projects/mtg/bin/Res/sets/MIR/todo.dat b/projects/mtg/bin/Res/sets/MIR/todo.dat
index a5f1c2581..3e2da38a4 100644
--- a/projects/mtg/bin/Res/sets/MIR/todo.dat
+++ b/projects/mtg/bin/Res/sets/MIR/todo.dat
@@ -1026,17 +1026,6 @@ subtype=Fungus Wall
 toughness=1
 [/card]
 [card]
-text={B}, Sacrifice a Swamp: Put a +1/+1 counter on Mire Shade. Play this ability only any time you could play a sorcery.
-id=3300
-name=Mire Shade
-rarity=U
-type=Creature
-mana={1}{B}
-power=1
-subtype=Shade
-toughness=1
-[/card]
-[card]
 text=At the beginning of each opponent's upkeep, if that player has five or more cards in hand, Misers' Cage deals 2 damage to him or her.
 id=3259
 name=Misers' Cage
diff --git a/projects/mtg/bin/Res/sets/STH/_cards.dat b/projects/mtg/bin/Res/sets/STH/_cards.dat
index 9698c2f25..918f1b29d 100644
--- a/projects/mtg/bin/Res/sets/STH/_cards.dat
+++ b/projects/mtg/bin/Res/sets/STH/_cards.dat
@@ -588,6 +588,15 @@ power=2
 toughness=2
 [/card]
 [card]
+text={2}, Tap an untapped creature you control: You gain 2 life. Activate this ability only any time you could cast a sorcery.
+id=5260
+name=Volrath's Gardens
+auto={2}:tap notatarget(creature[-tapped]|myBattlefield) && life:2 controller asSorcery
+rarity=R
+mana={1}{G}
+type=Enchantment
+[/card]
+[card]
 text={T}: Add {1} to your mana pool.   {1}{B}, {T}: Put target creature card from your graveyard on top of your library.
 id=5263
 name=Volrath's Stronghold
@@ -598,17 +607,17 @@ type=Land
 abilities=legendary
 [/card]
 [card]
+text=Walking Dream is unblockable.   Walking Dream doesn't untap during your untap step if an opponent controls two or more creatures.
+auto=aslongas(creature|opponentBattlefield) doesnotuntap >1
 id=5264
 name=Walking Dream
+rarity=U
 mana={3}{U}
 type=Creature
 subtype=Illusion
 power=3
 toughness=3
-text=Walking Dream is unblockable.  Walking Dream doesn't untap during your untap step if an opponent controls two or more creatures.
-auto=aslongas(creature|opponentinplay) doesnotuntap >1
 abilities=unblockable
-rarity=U
 [/card]
 [card]
 text=Defender   When Wall of Blossoms enters the battlefield, draw a card.
diff --git a/projects/mtg/bin/Res/sets/STH/todo.dat b/projects/mtg/bin/Res/sets/STH/todo.dat
index b08206cda..544d69567 100644
--- a/projects/mtg/bin/Res/sets/STH/todo.dat
+++ b/projects/mtg/bin/Res/sets/STH/todo.dat
@@ -257,8 +257,6 @@ type=Enchantment
 text=Put a card from your hand on top of your library: Prevent all damage that would be dealt by target instant or sorcery spell this turn.
 rarity=R
 [/card]
-
-
 [card]
 id=5173
 name=Hornet Cannon
@@ -267,7 +265,6 @@ type=Artifact
 text={3}, {T}: Put a 1/1 colorless Insect artifact creature token with flying and haste named Hornet onto the battlefield. Destroy that creature at the beginning of the next end step.
 rarity=U
 [/card]
-
 [card]
 id=5175
 name=Invasion Plans
@@ -303,7 +300,6 @@ toughness=3
 text=Trample {0}: The next 1 damage that would be dealt to Lancers en-Kor this turn is dealt to target creature you control instead.
 rarity=U
 [/card]
-
 [card]
 id=5181
 name=Lowland Basilisk
@@ -331,7 +327,6 @@ type=Instant
 text=As an additional cost to cast Mask of the Mimic, sacrifice a creature. Search your library for a card with the same name as target nontoken creature and put that card onto the battlefield. Then shuffle your library.
 rarity=U
 [/card]
-
 [card]
 id=5186
 name=Mind Games
@@ -359,7 +354,6 @@ toughness=0
 text=Mindwarper enters the battlefield with three +1/+1 counters on it. {2}{B}, Remove a +1/+1 counter from Mindwarper: Target player discards a card. Activate this ability only any time you could cast a sorcery.
 rarity=R
 [/card]
-
 [card]
 id=4980
 name=Mogg Bombers
@@ -371,7 +365,6 @@ toughness=4
 text=When another creature enters the battlefield, sacrifice Mogg Bombers. If you do, it deals 3 damage to target player.
 rarity=C
 [/card]
-
 [card]
 id=5107
 name=Mogg Infestation
@@ -391,7 +384,6 @@ toughness=1
 text=Whenever Mogg Maniac is dealt damage, it deals that much damage to target opponent.
 rarity=U
 [/card]
-
 [card]
 id=5192
 name=Mortuary
@@ -444,7 +436,6 @@ type=Artifact
 text=Whenever a creature enters the battlefield, if there are two or more other creatures on the battlefield, exile that creature. Return that card to the battlefield under its owner's control when Portcullis leaves the battlefield.
 rarity=R
 [/card]
-
 [card]
 id=5203
 name=Provoke
@@ -461,7 +452,6 @@ type=Enchantment
 text=If you would draw a card, you may put a study counter on Pursuit of Knowledge instead.  Remove three study counters from Pursuit of Knowledge, Sacrifice Pursuit of Knowledge: Draw seven cards.
 rarity=R
 [/card]
-
 [card]
 id=5206
 name=Ransack
@@ -486,9 +476,6 @@ type=Instant
 text=Untap all creatures you control and all creatures target opponent controls. You and that opponent each gain control of all creatures the other controls until end of turn. Those creatures gain haste until end of turn.
 rarity=R
 [/card]
-
-
-
 [card]
 id=5214
 name=Sacred Ground
@@ -522,7 +509,6 @@ type=Sorcery
 text=Buyback {3} (You may pay an additional {3} as you cast this spell. If you do, put this card into your hand as it resolves.) Target creature gets +3/+0 until end of turn.
 rarity=C
 [/card]
-
 [card]
 id=5220
 name=Shaman en-Kor
@@ -545,7 +531,6 @@ toughness=0
 text=Defender (This creature can't attack.) Shifting Wall enters the battlefield with X +1/+1 counters on it.
 rarity=U
 [/card]
-
 [card]
 id=5223
 name=Sift
@@ -676,7 +661,6 @@ toughness=1
 text=Flying At the beginning of your upkeep, sacrifice Spindrift Drake unless you pay {U}.
 rarity=C
 [/card]
-
 [card]
 id=5236
 name=Spirit en-Kor
@@ -701,9 +685,6 @@ auto=counter(1/1,4)
 auto={1}{R}:counter(1/1,-1) && damage:1 target(creature)
 rarity=R
 [/card]
-
-
-
 [card]
 id=5251
 name=Temper
@@ -753,9 +734,6 @@ toughness=1
 text={T}: Target land becomes an Island until end of turn.
 rarity=C
 [/card]
-
-
-
 [card]
 id=5259
 name=Verdant Touch
@@ -764,15 +742,6 @@ type=Sorcery
 text=Buyback {3} (You may pay an additional {3} as you cast this spell. If you do, put this card into your hand as it resolves.) Target land becomes a 2/2 creature that's still a land. (This effect lasts indefinitely.)
 rarity=R
 [/card]
-
-[card]
-id=5260
-name=Volrath's Gardens
-mana={1}{G}
-type=Enchantment
-text={2}, Tap an untapped creature you control: You gain 2 life. Activate this ability only any time you could cast a sorcery.
-rarity=R
-[/card]
 [card]
 id=5261
 name=Volrath's Laboratory
@@ -792,9 +761,6 @@ toughness=1
 text=As long as the top card of your graveyard is a creature card, Volrath's Shapeshifter has the full text of that card and has the text "{2}: Discard a card." (Volrath's Shapeshifter has that card's name, mana cost, color, types, abilities, power, and toughness.) {2}: Discard a card.
 rarity=R
 [/card]
-
-
-
 [card]
 id=5267
 name=Wall of Essence
@@ -806,7 +772,6 @@ toughness=4
 text=Defender (This creature can't attack.) Whenever Wall of Essence is dealt combat damage, you gain that much life.
 rarity=U
 [/card]
-
 [card]
 id=5269
 name=Wall of Souls
@@ -829,7 +794,6 @@ toughness=4
 text=Defender (This creature can't attack.) Whenever Wall of Tears blocks a creature, return that creature to its owner's hand at end of combat.
 rarity=U
 [/card]
-
 [card]
 id=5272
 name=Warrior en-Kor
diff --git a/projects/mtg/bin/Res/sets/VIS/_cards.dat b/projects/mtg/bin/Res/sets/VIS/_cards.dat
index da086a4fb..06e8a38e4 100644
--- a/projects/mtg/bin/Res/sets/VIS/_cards.dat
+++ b/projects/mtg/bin/Res/sets/VIS/_cards.dat
@@ -497,11 +497,23 @@ mana={R}
 type=Sorcery
 [/card]
 [card]
+text={B}, Sacrifice Urborg Mindsucker: Target opponent discards a card at random. Activate this ability only any time you could cast a sorcery.
+id=3628
+name=Urborg Mindsucker
+rarity=C
+mana={2}{B}
+type=Creature
+subtype=Horror
+auto={B}{S}:discard:1 opponent asSorcery
+power=2
+toughness=2
+[/card]
+[card]
 text=Enchant creature   When Vampirism enters the battlefield, draw a card at the beginning of the next turn's upkeep.   Enchanted creature gets +1/+1 for each other creature you control.   Other creatures you control get -1/-1.
 target=creature
 auto=foreach(other creature|myBattlefield) 1/1
 auto=lord(other creature|myBattlefield) -1/-1
-auto=@next upkeep:draw:1
+auto=@next upkeep:draw:1 controller
 id=3630
 name=Vampirism
 rarity=U
diff --git a/projects/mtg/bin/Res/sets/VIS/todo.dat b/projects/mtg/bin/Res/sets/VIS/todo.dat
index d63415e42..c91c7b7ef 100644
--- a/projects/mtg/bin/Res/sets/VIS/todo.dat
+++ b/projects/mtg/bin/Res/sets/VIS/todo.dat
@@ -1008,17 +1008,6 @@ text=Return two target creatures to their owners' hands.
 rarity=U
 [/card]
 [card]
-id=3628
-name=Urborg Mindsucker
-mana={2}{B}
-type=Creature
-subtype=Horror
-power=2
-toughness=2
-text={B}, Sacrifice Urborg Mindsucker: Target opponent discards a card at random. Activate this ability only any time you could cast a sorcery.
-rarity=C
-[/card]
-[card]
 id=3629
 name=Vampiric Tutor
 mana={B}