diff --git a/projects/mtg/bin/Res/sets/ALL/_cards.dat b/projects/mtg/bin/Res/sets/ALL/_cards.dat
index f685b0b9c..fd3b1cd0f 100644
--- a/projects/mtg/bin/Res/sets/ALL/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ALL/_cards.dat
@@ -178,6 +178,26 @@ mana={2}{W}
 type=Instant
 [/card]
 [card]
+text=Choose one - Put a 2/2 black Zombie creature token onto the battlefield; or destroy target nonblack, nonartifact creature and it can't be regenerated.
+auto=may token(Zombie,Creature Zombie,2/2,black)
+auto=may bury target(creature[-black;-artifact])
+id=3073
+name=Feast or Famine
+rarity=C
+mana={3}{B}
+type=Instant
+[/card]
+[card]
+text=Choose one - Put a 2/2 black Zombie creature token onto the battlefield; or destroy target nonblack, nonartifact creature and it can't be regenerated.
+auto=may token(Zombie,Creature Zombie,2/2,black)
+auto=may bury target(creature[-black;-artifact])
+id=3074
+name=Feast or Famine
+rarity=C
+mana={3}{B}
+type=Instant
+[/card]
+[card]
 text=Target creature gets +2/+0 until end of turn.   Draw a card at the beginning of the next turn's upkeep.
 id=3075
 target=Creature
diff --git a/projects/mtg/bin/Res/sets/ALL/todo.dat b/projects/mtg/bin/Res/sets/ALL/todo.dat
index cc1347f0d..ee350c416 100644
--- a/projects/mtg/bin/Res/sets/ALL/todo.dat
+++ b/projects/mtg/bin/Res/sets/ALL/todo.dat
@@ -340,28 +340,6 @@ text=An opponent chooses one  EYou draw three cards; or you destroy up to two
 rarity=R
 [/card]
 [card]
-id=3073
-name=Feast or Famine
-mana={3}{B}
-type=Instant
-text=Choose one - Put a 2/2 black Zombie creature token onto the battlefield; or destroy target nonblack, nonartifact creature and it can't be regenerated.
-auto=may token(Zombie,Creature Zombie,2/2,black)
-auto=may bury target(creature[-black;-artifact])
-#Not sure this would work need to retest this one
-rarity=C
-[/card]
-[card]
-id=3074
-name=Feast or Famine
-mana={3}{B}
-type=Instant
-text=Choose one  EPut a 2/2 black Zombie creature token onto the battlefield; or destroy target nonblack, nonartifact creature and it can't be regenerated.
-auto=may token(Zombie,Creature Zombie,2/2,black)
-auto=may bury target(creature[-black;-artifact])
-#Not sure this would work need to retest this one
-rarity=C
-[/card]
-[card]
 id=3045
 name=Floodwater Dam
 mana={3}
diff --git a/projects/mtg/bin/Res/sets/APC/_cards.dat b/projects/mtg/bin/Res/sets/APC/_cards.dat
index bb6faef53..2e703a0cd 100644
--- a/projects/mtg/bin/Res/sets/APC/_cards.dat
+++ b/projects/mtg/bin/Res/sets/APC/_cards.dat
@@ -1,4 +1,15 @@
 [card]
+text=Kicker {B} (You may pay an additional {B} as you cast this spell.) Creatures you control get +1/+1 until end of turn.   If Strength of Night was kicked, Zombie creatures you control get an additional +2/+2 until end of turn.
+id=28007
+name=Strength of Night
+rarity=C
+mana={2}{G}
+kicker={B}
+auto=kicker lord(creature|myBattlefield) 1/1
+auto=lord(creature[zombie]|myBattlefield) 2/2
+type=Instant
+[/card]
+[card]
 text=Return target creature to its owner's hand.   Put X 1/1 green Saproling creature tokens onto the battlefield, where X is that creature's converted mana cost.
 id=28669
 name=AEther Mutation
diff --git a/projects/mtg/bin/Res/sets/APC/todo.dat b/projects/mtg/bin/Res/sets/APC/todo.dat
index a621523a0..717cc0fa1 100644
--- a/projects/mtg/bin/Res/sets/APC/todo.dat
+++ b/projects/mtg/bin/Res/sets/APC/todo.dat
@@ -670,14 +670,6 @@ text=While choosing targets as part of casting a spell or activating an ability,
 rarity=C
 [/card]
 [card]
-id=28007
-name=Strength of Night
-mana={2}{G}
-type=Instant
-text=Kicker {B} (You may pay an additional {B} as you cast this spell.) Creatures you control get +1/+1 until end of turn. If Strength of Night was kicked, Zombie creatures you control get an additional +2/+2 until end of turn.
-rarity=C
-[/card]
-[card]
 id=27583
 name=Suffocating Blast
 mana={1}{U}{U}{R}
diff --git a/projects/mtg/bin/Res/sets/CFX/_cards.dat b/projects/mtg/bin/Res/sets/CFX/_cards.dat
index 443f37495..6c656a5a1 100644
--- a/projects/mtg/bin/Res/sets/CFX/_cards.dat
+++ b/projects/mtg/bin/Res/sets/CFX/_cards.dat
@@ -1,5 +1,5 @@
 [card]
-text=Target player loses 4 life and you gain 4 life.     Basic landcycling {1}{B} ({1}{B}, Discard this card: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.)
+text=Target player loses 4 life and you gain 4 life.   Basic landcycling {1}{B} ({1}{B}, Discard this card: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.)
 target=player
 auto=life:-4
 auto=life:4 controller
@@ -7,8 +7,8 @@ autohand={1}{B}{S}:moveTo(myhand) target(land[basic]|mylibrary)
 id=179513
 name=Absorb Vis
 rarity=C
-type=Sorcery
 mana={6}{B}
+type=Sorcery
 [/card]
 [card]
 text=Flying   {1}{G}{U}: Creatures you control gain shroud until end of turn. 
@@ -105,14 +105,14 @@ toughness=5
 abilities=flying,trample
 [/card]
 [card]
-text=Equipped creature gets +1/+0.     Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
+text=Equipped creature gets +1/+0.   Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
 id=189270
 name=Bone Saw
 rarity=C
+mana={0}
 auto={1}:equip
 auto=1/0
 type=Artifact
-mana={0}
 subtype=Equipment
 [/card]
 [card]
@@ -127,9 +127,9 @@ toughness=3
 [/card]
 [card]
 text=Exile target black or red permanent.
+id=183055
 target=*[black;red]
 auto=moveTo(exile)
-id=183055
 name=Celestial Purge
 rarity=U
 mana={1}{W}
@@ -163,27 +163,27 @@ abilities=trample,legendary
 [/card]
 [card]
 text=Cliffrunner Behemoth has haste as long as you control a red permanent.     Cliffrunner Behemoth has lifelink as long as you control a white permanent.
-auto=aslongas(*[red]|myBattlefield) haste
-auto=aslongas(*[white]|myBattlefield) lifelink
 id=159612
 name=Cliffrunner Behemoth
 rarity=R
 mana={3}{G}
 type=Creature
 subtype=Rhino Beast
+auto=aslongas(*[red]|myBattlefield) haste
+auto=aslongas(*[white]|myBattlefield) lifelink
 power=5
 toughness=3
 [/card]
 [card]
-text=Target creature gets -3/-0 until end of turn.     Cycling {2} ({2}, Discard this card: Draw a card.)
+text=Target creature gets -3/-0 until end of turn.   Cycling {2} ({2}, Discard this card: Draw a card.)
+id=180272
 target=creature
 auto=-3/-0
 autohand={2}:cycling
-id=180272
 name=Constricting Tendrils
 rarity=C
-type=Instant
 mana={U}
+type=Instant
 [/card]
 [card]
 text=Enchant red or green creature   Enchanted creature doesn't untap during its controller's untap step.
@@ -209,10 +209,10 @@ subtype=Aura
 [/card]
 [card]
 text=Counter target noncreature spell. Its controller loses 2 life. 
+id=186327
 target=*[-creature]|stack
 auto=fizzle
 auto=life:-2 targetController
-id=186327
 name=Countersquall
 rarity=U
 mana={U}{B}
@@ -220,13 +220,13 @@ type=Instant
 [/card]
 [card]
 text=Court Homunculus gets +1/+1 as long as you control another artifact.
-auto=aslongas(other artifact|myBattlefield) 1/1
 id=182607
 name=Court Homunculus
 rarity=C
 mana={W}
 type=Artifact Creature
 subtype=Homunculus
+auto=aslongas(other artifact|myBattlefield) 1/1
 power=1
 toughness=1
 [/card]
@@ -241,13 +241,13 @@ type=Artifact
 [/card]
 [card]
 text={R}{G}{W}: Cylian Sunsinger and each other creature with the same name as it get +3/+3 until end of turn.
-auto={R}{G}{W}:lord(cylian sunsinger) 3/3 ueot
 id=189081
 name=Cylian Sunsinger
 rarity=R
 mana={1}{G}
 type=Creature
 subtype=Elf Shaman
+auto={R}{G}{W}:lord(cylian sunsinger) 3/3 ueot
 power=2
 toughness=2
 [/card]
@@ -268,38 +268,38 @@ abilities=flying
 text=Domain - Target creature gets -1/-1 until end of turn for each basic land type among lands you control.
 id=179239
 target=creature
-name=Drag Down
 auto=aslongas(forest|myBattlefield) -1/-1 
 auto=aslongas(island|myBattlefield) -1/-1
 auto=aslongas(plains|myBattlefield) -1/-1
 auto=aslongas(mountain|myBattlefield) -1/-1
 auto=aslongas(swamp|myBattlefield) -1/-1
+name=Drag Down
 rarity=C
 mana={2}{B}
 type=Instant
 [/card]
 [card]
 text={1}{U}{R}: Dreadwing gets +3/+0 and gains flying until end of turn.
-auto={1}{U}{R}:3/0 && flying
 id=159629
 name=Dreadwing
 rarity=U
 mana={B}
 type=Creature
 subtype=Zombie
+auto={1}{U}{R}:3/0 && flying
 power=1
 toughness=1
 [/card]
 [card]
 text=Reach (This can block creatures with flying.)  As long as you control a red permanent, Ember Weaver gets +1/+0 and has first strike.
-auto=aslongas(*[red]|myBattlefield) 1/0
-auto=aslongas(*[red]|myBattlefield) first strike
 id=184990
 name=Ember Weaver
 rarity=C
 mana={2}{G}
 type=Creature
 subtype=Spider
+auto=aslongas(*[red]|myBattlefield) 1/0
+auto=aslongas(*[red]|myBattlefield) first strike
 power=2
 toughness=3
 abilities=reach
@@ -318,28 +318,28 @@ abilities=flying
 [/card]
 [card]
 text=Flying   {1}{W}{B}, {T}: Destroy target creature or enchantment.   {2}{U}: Untap Ethersworn Adjudicator.
-auto={1}{W}{B}{T}:destroy target(creature,enchantment)
-auto={2}{U}:untap
 id=175035
 name=Ethersworn Adjudicator
 rarity=M
 mana={4}{U}
 type=Artifact Creature
 subtype=Vedalken Knight
+auto={1}{W}{B}{T}:destroy target(creature,enchantment)
+auto={2}{U}:untap
 power=4
 toughness=4
 abilities=flying
 [/card]
 [card]
-text=Fiery Fall deals 5 damage to target creature.     Basic landcycling {1}{R} ({1}{R}, Discard this card: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.)
+text=Fiery Fall deals 5 damage to target creature.   Basic landcycling {1}{R} ({1}{R}, Discard this card: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.)
 target=creature
 auto=damage:5
 autohand={1}{R}{S}:moveTo(myhand) target(land[basic]|mylibrary)
 id=179519
 name=Fiery Fall
 rarity=C
-type=Instant
 mana={5}{R}
+type=Instant
 [/card]
 [card]
 text={W}{U}{B}{R}{G}: Fleshformer gets +2/+2 and gains fear until end of turn. Target creature gets -2/-2 until end of turn. Play this ability only during your turn.
@@ -347,10 +347,10 @@ auto={W}{U}{B}{R}{G}:all(this) 2/2 && all(this) fear && -2/-2 target(creature) m
 id=179884
 name=Fleshformer
 rarity=U
-type=Creature
 mana={2}{B}
-power=2
+type=Creature
 subtype=Human Wizard
+power=2
 toughness=2
 [/card]
 [card]
@@ -375,15 +375,15 @@ power=8
 toughness=8
 [/card]
 [card]
-text=Creatures you control get +1/+2 until end of turn. Untap those creatures.     Basic landcycling {1}{W} ({1}{W}, Discard this card: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.)
+text=Creatures you control get +1/+2 until end of turn. Untap those creatures.   Basic landcycling {1}{W} ({1}{W}, Discard this card: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.)
 auto=lord(creature|myBattlefield) 1/2
 auto=untap all(creature|myBattlefield)
 autohand={1}{W}{S}:moveTo(myhand) target(land[basic]|mylibrary)
 id=179505
 name=Gleam of Resistance
 rarity=C
-type=Instant
 mana={4}{W}
+type=Instant
 [/card]
 [card]
 text=Protection from white
@@ -486,6 +486,7 @@ text=Domain - Equipped creature gets +1/+1 for each basic land type among lands
 id=180159
 name=Manaforce Mace
 rarity=U
+mana={4}
 type=Artifact
 auto={3}:equip
 auto=aslongas(forest|myBattlefield) 1/1
@@ -493,15 +494,14 @@ auto=aslongas(mountain|myBattlefield) 1/1
 auto=aslongas(plains|myBattlefield) 1/1
 auto=aslongas(swamp|myBattlefield) 1/1
 auto=aslongas(island|myBattlefield) 1/1
-mana={4}
 subtype=Equipment
 [/card]
 [card]
 text=Enchant creature   Enchanted creature gets +2/+2 and can't block.
+id=182609
 target=creature
 auto=2/2
 auto=cantblock
-id=182609
 name=Maniacal Rage
 rarity=C
 mana={1}{R}
@@ -526,28 +526,28 @@ toughness=*
 [/card]
 [card]
 text=Domain - Target creature gets +1/+1 until end of turn for each basic land type among lands you control.
+id=150810
+target=Creature
 auto=aslongas(forest|myBattlefield) 1/1
 auto=aslongas(mountain|myBattlefield) 1/1
 auto=aslongas(plains|myBattlefield) 1/1
 auto=aslongas(swamp|myBattlefield) 1/1
 auto=aslongas(island|myBattlefield) 1/1
-id=150810
 name=Might of Alara
-target=Creature
 rarity=C
 mana={G}
 type=Instant
 [/card]
 [card]
-text=Destroy target artifact creature.     Cycling {2} ({2}, Discard this card: Draw a card.)
+text=Destroy target artifact creature.   Cycling {2} ({2}, Discard this card: Draw a card.)
+id=184988
 target=creature[artifact]
 auto=destroy
 autohand={2}:cycling
-id=184988
 name=Molten Frame
 rarity=C
-type=Instant
 mana={1}{R}
+type=Instant
 [/card]
 [card]
 text=Protection from blue
@@ -574,7 +574,7 @@ power=2
 toughness=1
 [/card]
 [card]
-text=Exalted (Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.)  {T}: Add {G}, {W}, or {U} to your mana pool.
+text=Exalted (Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.)   {T}: Add {G}, {W}, or {U} to your mana pool.
 id=179434
 name=Noble Hierarch
 rarity=R
@@ -590,19 +590,18 @@ abilities=exalted
 [/card]
 [card]
 text=As Nyxathid enters the battlefield, choose an opponent.   Nyxathid gets -1/-1 for each card in the chosen player's hand.
-auto=foreach(*|opponenthand) -1/-1
 id=186616
 name=Nyxathid
 rarity=R
 mana={1}{B}{B}
 type=Creature
 subtype=Elemental
+auto=foreach(*|opponenthand) -1/-1
 power=7
 toughness=7
 [/card]
 [card]
 text=Whenever another creature with power 5 or greater enters the battlefield under your control, you may return target creature card from your graveyard to your hand.
-auto=may moveTo(myhand) target(creature|mygraveyard)
 auto=@movedTo(other creature[power>=5]|myBattlefield):may moveTo(myhand) target(creature|mygraveyard)
 id=189873
 name=Paleoloth
@@ -628,7 +627,7 @@ toughness=2
 abilities=flying
 [/card]
 [card]
-text=Flying.   Deathtouch (Whenever this creature deals damage to a creature, destroy that creature.)   {2}{R}: Pestilent Kathari gains first strike until end of turn.
+text=Flying   Deathtouch (Whenever this creature deals damage to a creature, destroy that creature.)   {2}{R}: Pestilent Kathari gains first strike until end of turn.
 id=179518
 name=Pestilent Kathari
 rarity=C
@@ -692,25 +691,25 @@ toughness=3
 [/card]
 [card]
 text=Salvage Slasher gets +1/+0 for each artifact card in your graveyard.
-auto=foreach(artifact|mygraveyard) 1/0
 id=179254
 name=Salvage Slasher
 rarity=C
 mana={1}{B}
 type=Artifact Creature
 subtype=Human Rogue
+auto=foreach(artifact|mygraveyard) 1/0
 power=1
 toughness=1
 [/card]
 [card]
 text=Sacrifice a creature: Put a +1/+1 counter on Scarland Thrinax.
-auto={S(creature|myBattlefield)}:counter(1/1)
 id=183025
 name=Scarland Thrinax
 rarity=U
 mana={B}{R}{G}
 type=Creature
 subtype=Lizard
+auto={S(creature|myBattlefield)}:counter(1/1)
 power=2
 toughness=2
 [/card]
@@ -746,13 +745,13 @@ type=Artifact
 [/card]
 [card]
 text={W}{B}: Scornful AEther-Lich gains fear and vigilance until end of turn.
-auto={W}{B}:fear && vigilance
 id=186328
 name=Scornful AEther-Lich
 rarity=U
 mana={3}{U}
 type=Artifact Creature
 subtype=Zombie Wizard
+auto={W}{B}:fear && vigilance
 power=2
 toughness=4
 [/card]
@@ -811,15 +810,15 @@ mana={3}{B}{R}
 type=Enchantment
 [/card]
 [card]
-text=Target player gains 8 life.     Basic landcycling {1}{G} ({1}{G}, Discard this card: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.)
+text=Target player gains 8 life.   Basic landcycling {1}{G} ({1}{G}, Discard this card: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.)
+autohand={1}{G}{S}:moveTo(myhand) target(land[basic]|mylibrary)
+target=player
+auto=life:8
 id=179523
 name=Sylvan Bounty
 rarity=C
-type=Instant
-target=player
-auto=life:8
-autohand={1}{G}{S}:moveTo(myhand) target(land[basic]|mylibrary)
 mana={5}{G}
+type=Instant
 [/card]
 [card]
 text={G}: Thornling gains haste until end of turn.   {G}: Thornling gains trample until end of turn.   {G}: Thornling is indestructible this turn.   {1}: Thornling gets +1/-1 until end of turn.   {1}: Thornling gets -1/+1 until end of turn.
@@ -841,24 +840,24 @@ toughness=4
 text=Toxic Iguanar has deathtouch as long as you control a green permanent. (Whenever it deals damage to a creature, destroy that creature.)
 id=170956
 name=Toxic Iguanar
-auto=aslongas(*[green]|myBattlefield) deathtouch
 rarity=C
 mana={R}
 type=Creature
 subtype=Lizard
+auto=aslongas(*[green]|myBattlefield) deathtouch
 power=1
 toughness=1
 [/card]
 [card]
-text=Counter target spell.     Basic landcycling {1}{U} ({1}{U}, Discard this card: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.)
+text=Counter target spell.   Basic landcycling {1}{U} ({1}{U}, Discard this card: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.)
+autohand={1}{U}{S}:moveTo(myhand) target(land[basic]|mylibrary)
+target=*|stack
+auto=fizzle
 id=179508
 name=Traumatic Visions
 rarity=C
-type=Instant
 mana={3}{U}{U}
-target=*|stack
-auto=fizzle
-autohand={1}{U}{S}:moveTo(myhand) target(land[basic]|mylibrary)
+type=Instant
 [/card]
 [card]
 text=When Tukatongue Thallid is put into a graveyard from the battlefield, put a 1/1 green Saproling creature token onto the battlefield.
@@ -919,13 +918,13 @@ toughness=3
 [/card]
 [card]
 text={U}{B}: Vectis Agents gets -2/-0 until end of turn and is unblockable this turn.
-auto={U}{B}:-2/0 && unblockable
 id=183063
 name=Vectis Agents
 rarity=C
 mana={3}{U}{B}
 type=Artifact Creature
 subtype=Human Rogue
+auto={U}{B}:-2/0 && unblockable
 power=4
 toughness=3
 [/card]
@@ -943,25 +942,25 @@ abilities=protection from red
 [/card]
 [card]
 text=Double strike   {B}{G}: Viashino Slaughtermaster gets +1/+1 until end of turn. Play this ability only once each turn.
-auto={B}{G}:1/1 limit:1
 id=179245
 name=Viashino Slaughtermaster
 rarity=U
 mana={1}{R}
 type=Creature
 subtype=Viashino Warrior
+auto={B}{G}:1/1 limit:1
 power=1
 toughness=1
 abilities=double strike
 [/card]
 [card]
-text=Volcanic Fallout can't be countered.     Volcanic Fallout deals 2 damage to each creature and each player.
+text=Volcanic Fallout can't be countered.   Volcanic Fallout deals 2 damage to each creature and each player.
 auto=damage:2 all(creature,player)
 id=180274
 name=Volcanic Fallout
 rarity=U
-type=Instant
 mana={1}{R}{R}
+type=Instant
 abilities=nofizzle
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/sets/DIS/_cards.dat b/projects/mtg/bin/Res/sets/DIS/_cards.dat
index c950ce685..b78ea54d8 100644
--- a/projects/mtg/bin/Res/sets/DIS/_cards.dat
+++ b/projects/mtg/bin/Res/sets/DIS/_cards.dat
@@ -47,6 +47,15 @@ toughness=1
 abilities=flying
 [/card]
 [card]
+text=({(g/u)} can be paid with either {G} or {U}.) Draw a card for each creature target player controls, then draw a card for each creature another target player controls.
+id=107277
+auto=foreach(creature|battlefield) draw:1
+name=Biomantic Mastery
+rarity=R
+mana={4}{GU}{GU}{GU}
+type=Sorcery
+[/card]
+[card]
 text=({T}: Add {B} or {R} to your mana pool.)   As Blood Crypt enters the battlefield, you may pay 2 life. If you don't, Blood Crypt enters the battlefield tapped.
 id=97102
 name=Blood Crypt
diff --git a/projects/mtg/bin/Res/sets/DIS/todo.dat b/projects/mtg/bin/Res/sets/DIS/todo.dat
index 1587c6efa..cafac7103 100644
--- a/projects/mtg/bin/Res/sets/DIS/todo.dat
+++ b/projects/mtg/bin/Res/sets/DIS/todo.dat
@@ -97,14 +97,6 @@ text=Prevent all combat damage target creature would deal this turn. Prevent all
 rarity=U
 [/card]
 [card]
-id=107277
-name=Biomantic Mastery
-mana={4}{GU}{GU}{GU}
-type=Sorcery
-text=({(g/u)} can be paid with either {G} or {U}.) Draw a card for each creature target player controls, then draw a card for each creature another target player controls.
-rarity=R
-[/card]
-[card]
 id=107307
 name=Blessing of the Nephilim
 mana={W}
diff --git a/projects/mtg/bin/Res/sets/DST/_cards.dat b/projects/mtg/bin/Res/sets/DST/_cards.dat
index 0bc1011ae..8450d2ee5 100644
--- a/projects/mtg/bin/Res/sets/DST/_cards.dat
+++ b/projects/mtg/bin/Res/sets/DST/_cards.dat
@@ -165,6 +165,17 @@ type=Sorcery
 rarity=U
 [/card]
 [card]
+text=Flamebreak deals 3 damage to each creature without flying and each player. Creatures dealt damage this way can't be regenerated this turn.
+id=50539
+auto=damage:3 all(creature[-flying])
+auto=damage:3 all(player)
+auto=lord(creature[-flying]) cantregenerate
+name=Flamebreak
+rarity=R
+mana={R}{R}{R}
+type=Sorcery
+[/card]
+[card]
 text=Whenever an opponent discards a card, you may draw a card.
 id=51070
 name=Geth's Grimoire
diff --git a/projects/mtg/bin/Res/sets/DST/todo.dat b/projects/mtg/bin/Res/sets/DST/todo.dat
index 2c6cff708..5b87148ba 100644
--- a/projects/mtg/bin/Res/sets/DST/todo.dat
+++ b/projects/mtg/bin/Res/sets/DST/todo.dat
@@ -378,14 +378,6 @@ text=Whenever Fangren Firstborn attacks, put a +1/+1 counter on each attacking c
 rarity=R
 [/card]
 [card]
-id=50539
-name=Flamebreak
-mana={R}{R}{R}
-type=Sorcery
-text=Flamebreak deals 3 damage to each creature without flying and each player. Creatures dealt damage this way can't be regenerated this turn.
-rarity=R
-[/card]
-[card]
 id=46060
 name=Furnace Dragon
 mana={6}{R}{R}{R}
diff --git a/projects/mtg/bin/Res/sets/EVE/_cards.dat b/projects/mtg/bin/Res/sets/EVE/_cards.dat
index c4837bed7..502ca0ddd 100644
--- a/projects/mtg/bin/Res/sets/EVE/_cards.dat
+++ b/projects/mtg/bin/Res/sets/EVE/_cards.dat
@@ -221,7 +221,8 @@ type=Sorcery
 text=Counter target spell. Its controller draws a card.   Draw a card.
 id=153036
 target=*|stack
-auto=fizzle && draw:1 controller
+auto=fizzle
+auto=draw:1 controller
 auto=draw:1 targetController
 name=Dream Fracture
 rarity=U
diff --git a/projects/mtg/bin/Res/sets/EXO/_cards.dat b/projects/mtg/bin/Res/sets/EXO/_cards.dat
index acca82b48..da1f44d0d 100644
--- a/projects/mtg/bin/Res/sets/EXO/_cards.dat
+++ b/projects/mtg/bin/Res/sets/EXO/_cards.dat
@@ -1,14 +1,4 @@
 [card]
-text=Sacrifice a creature, Return Recurring Nightmare to its owner's hand: Return target creature card from your graveyard to the battlefield. Activate this ability only any time you could cast a sorcery.
-auto={S(creature|myBattlefield)}:moveto(myhand) all(this) && moveto(myBattlefield) target(creature|mygraveyard) asSorcery
-
-id=6103
-name=Recurring Nightmare
-rarity=R
-mana={2}{B}
-type=Enchantment
-[/card]
-[card]
 text=When Anarchist enters the battlefield, you may return target sorcery card from your graveyard to your hand.
 id=6110
 name=Anarchist
@@ -442,6 +432,16 @@ mana={G}
 type=Sorcery
 [/card]
 [card]
+text=Sacrifice a creature, Return Recurring Nightmare to its owner's hand: Return target creature card from your graveyard to the battlefield. Activate this ability only any time you could cast a sorcery.
+auto={S(creature|myBattlefield)}:moveto(myhand) all(this) && moveto(myBattlefield) target(creature|mygraveyard) asSorcery
+
+id=6103
+name=Recurring Nightmare
+rarity=R
+mana={2}{B}
+type=Enchantment
+[/card]
+[card]
 text=Until end of turn, creatures you control gain "{1}: Regenerate this creature."
 auto=lord(creature|mybattlefield) {1}:regenerate
 id=6140
diff --git a/projects/mtg/bin/Res/sets/FEM/_cards.dat b/projects/mtg/bin/Res/sets/FEM/_cards.dat
index ddaaa0713..a494d9b55 100644
--- a/projects/mtg/bin/Res/sets/FEM/_cards.dat
+++ b/projects/mtg/bin/Res/sets/FEM/_cards.dat
@@ -68,6 +68,54 @@ power=1
 toughness=2
 [/card]
 [card]
+text=Brassclaw Orcs can't block creatures with power 2 or greater.
+id=1937
+name=Brassclaw Orcs
+rarity=C
+mana={2}{R}
+type=Creature
+subtype=Orc
+auto=lord(creature[power>=2]) cantbeblockedby(brassclaw orcs)
+power=3
+toughness=2
+[/card]
+[card]
+text=Brassclaw Orcs can't block creatures with power 2 or greater.
+id=1938
+name=Brassclaw Orcs
+rarity=C
+mana={2}{R}
+type=Creature
+subtype=Orc
+auto=lord(creature[power>=2]) cantbeblockedby(brassclaw orcs)
+power=3
+toughness=2
+[/card]
+[card]
+text=Brassclaw Orcs can't block creatures with power 2 or greater.
+id=1940
+name=Brassclaw Orcs
+rarity=C
+mana={2}{R}
+type=Creature
+subtype=Orc
+auto=lord(creature[power>=2]) cantbeblockedby(brassclaw orcs)
+power=3
+toughness=2
+[/card]
+[card]
+text=Brassclaw Orcs can't block creatures with power 2 or greater.
+id=1966
+name=Brassclaw Orcs
+rarity=C
+mana={2}{R}
+type=Creature
+subtype=Orc
+auto=lord(creature[power>=2]) cantbeblockedby(brassclaw orcs)
+power=3
+toughness=2
+[/card]
+[card]
 text={2}, {T}, Discard a card at random: Regenerate target creature.
 auto={2}{T}:regenerate target(creature) && discard:1
 id=1832
@@ -371,6 +419,58 @@ mana={2}
 type=Artifact
 [/card]
 [card]
+text=Orcish Veteran can't block white creatures with power 2 or greater.   {R}: Orcish Veteran gains first strike until end of turn.
+id=1939
+name=Orcish Veteran
+rarity=C
+mana={2}{R}
+type=Creature
+subtype=Orc
+auto=lord(creature[white;power>=2]) cantbeblockedby(orcish veteran)
+auto={R}:first strike
+power=2
+toughness=2
+[/card]
+[card]
+text=Orcish Veteran can't block white creatures with power 2 or greater.   {R}: Orcish Veteran gains first strike until end of turn.
+id=1964
+name=Orcish Veteran
+rarity=C
+mana={2}{R}
+type=Creature
+subtype=Orc
+auto=lord(creature[white;power>=2]) cantbeblockedby(orcish veteran)
+auto={R}:first strike
+power=2
+toughness=2
+[/card]
+[card]
+text=Orcish Veteran can't block white creatures with power 2 or greater.   {R}: Orcish Veteran gains first strike until end of turn.
+id=1965
+name=Orcish Veteran
+rarity=C
+mana={2}{R}
+type=Creature
+subtype=Orc
+auto=lord(creature[white;power>=2]) cantbeblockedby(orcish veteran)
+auto={R}:first strike
+power=2
+toughness=2
+[/card]
+[card]
+text=Orcish Veteran can't block white creatures with power 2 or greater.   {R}: Orcish Veteran gains first strike until end of turn.
+id=1967
+name=Orcish Veteran
+rarity=C
+mana={2}{R}
+type=Creature
+subtype=Orc
+auto=lord(creature[white;power>=2]) cantbeblockedby(orcish veteran)
+auto={R}:first strike
+power=2
+toughness=2
+[/card]
+[card]
 text=Protection from black   {W}: Order of Leitbur gains first strike until end of turn.     {W}{W}: Order of Leitbur gets +1/+0 until end of turn.
 id=2000
 name=Order of Leitbur
@@ -455,6 +555,20 @@ toughness=1
 abilities=protection from white
 [/card]
 [card]
+text=Trample   Orgg can't attack if defending player controls an untapped creature with power 3 or greater.   Orgg can't block creatures with power 3 or greater.
+id=1968
+name=Orgg
+rarity=R
+mana={3}{R}{R}
+type=Creature
+subtype=Orgg
+auto=aslongas(creature[power>=3;-tapped]|opponentbattlefield]) cantattack
+auto=lord(creature[power>=3]) cantbeblockedby(orgg)
+power=6
+toughness=6
+abilities=trample
+[/card]
+[card]
 text={U}: River Merfolk gains mountainwalk until end of turn.
 id=1888
 name=River Merfolk
@@ -477,16 +591,16 @@ rarity=U
 type=Land
 [/card]
 [card]
+text={U}{U}, {T}: Target creature gains shroud until end of turn. Play this ability only during your upkeep. (It can't be the target of spells or abilities.)
 id=1890
 name=Svyelunite Priest
+rarity=U
 mana={1}{U}
 type=Creature
 subtype=Merfolk Cleric
+auto={U}{U}{T}:shroud target(creature) myUpkeepOnly
 power=1
 toughness=1
-text={U}{U}, {T}: Target creature gains shroud until end of turn. Play this ability only during your upkeep. (It can't be the target of spells or abilities.)
-auto={U}{U}{T}:shroud target(creature) myUpkeepOnly
-rarity=U
 [/card]
 [card]
 text=Svyelunite Temple enters the battlefield tapped.   {T}: Add {U} to your mana pool.   {T}, Sacrifice Svyelunite Temple: Add {U}{U} to your mana pool.
diff --git a/projects/mtg/bin/Res/sets/FEM/todo.dat b/projects/mtg/bin/Res/sets/FEM/todo.dat
index 4b71985e4..6c8d463c9 100644
--- a/projects/mtg/bin/Res/sets/FEM/todo.dat
+++ b/projects/mtg/bin/Res/sets/FEM/todo.dat
@@ -15,17 +15,6 @@ text=Bottomless Vault comes into play tapped.  You may choose not to untap Botto
 rarity=R
 [/card]
 [card]
-id=1940
-name=Brassclaw Orcs
-mana={2}{R}
-type=Creature
-subtype=Orc
-power=3
-toughness=2
-text=Brassclaw Orcs can't block creatures with power 2 or greater.
-rarity=C
-[/card]
-[card]
 id=1846
 name=Breeding Pit
 mana={3}{B}
@@ -90,7 +79,6 @@ toughness=4
 text=Black spells you play cost {B} more to play.
 rarity=U
 [/card]
-
 [card]
 id=1942
 name=Dwarven Catapult
@@ -495,28 +483,6 @@ text={T}: Look at the top three cards of target player's library.
 rarity=C
 [/card]
 [card]
-id=1965
-name=Orcish Veteran
-mana={2}{R}
-type=Creature
-subtype=Orc
-power=2
-toughness=2
-text=Orcish Veteran can't block white creatures with power 2 or greater. {R}: Orcish Veteran gains first strike until end of turn.
-rarity=C
-[/card]
-[card]
-id=1968
-name=Orgg
-mana={3}{R}{R}
-type=Creature
-subtype=Orgg
-power=6
-toughness=6
-text=Trample Orgg can't attack if defending player controls an untapped creature with power 3 or greater. Orgg can't block creatures with power 3 or greater.
-rarity=R
-[/card]
-[card]
 id=1969
 name=Raiding Party
 mana={2}{R}
diff --git a/projects/mtg/bin/Res/sets/FUT/_cards.dat b/projects/mtg/bin/Res/sets/FUT/_cards.dat
index 760ca5f1c..ebae5183b 100644
--- a/projects/mtg/bin/Res/sets/FUT/_cards.dat
+++ b/projects/mtg/bin/Res/sets/FUT/_cards.dat
@@ -375,15 +375,15 @@ auto={5}{R}:damage:6 all(other creature[flying])
 abilities=flying
 [/card]
 [card]
+text=The next creature card you play this turn can be played as though it had flash.   Draw a card.
 id=126200
-name=Scout's Warning
-mana={W}
-type=Instant
-text=The next creature card you play this turn can be played as though it had flash. Draw a card.
 target=creature|myhand
 auto=flash
-auto=draw:1
+auto=draw:1 controller
+name=Scout's Warning
 rarity=R
+mana={W}
+type=Instant
 [/card]
 [card]
 text={1}, {T}, Discard a card: Put a 1/1 Sliver artifact creature token named Metallic Sliver onto the battlefield.
@@ -398,17 +398,18 @@ power=1
 toughness=1
 [/card]
 [card]
+text=Swampwalk Cycling - Pay 2 life. (Pay 2 life, Discard this card: Draw a card.)
 id=136205
 name=Street Wraith
+rarity=U
+
 mana={3}{B}{B}
 type=Creature
 subtype=Wraith
+autohand={S}:life:-2 && draw:1
 power=3
 toughness=4
-text=Swampwalk Cycling - Pay 2 life. (Pay 2 life, Discard this card: Draw a card.)
 abilities=swampwalk
-autohand={S}:life:-2 && draw:1
-rarity=U
 [/card]
 [card]
 text=Tarmogoyf's power is equal to the number of card types among cards in all graveyards and its toughness is equal to that number plus 1. (The card types are artifact, creature, enchantment, instant, land, planeswalker, sorcery, and tribal.)
@@ -446,7 +447,7 @@ id=136047
 name=Tolaria West
 auto=tap
 auto={T}:Add{U}
-autohand={1}{U}{U}{S}:moveTo(myhand) target(*[manacost=0]|mylibrary) asSorcery
+autohand={1}{U}{U}{S}:moveTo(myhand) target(*[manacost=0;land]|mylibrary) asSorcery
 rarity=U
 type=Land
 [/card]
diff --git a/projects/mtg/bin/Res/sets/GPT/_cards.dat b/projects/mtg/bin/Res/sets/GPT/_cards.dat
index c984edee6..7ba94883e 100644
--- a/projects/mtg/bin/Res/sets/GPT/_cards.dat
+++ b/projects/mtg/bin/Res/sets/GPT/_cards.dat
@@ -472,6 +472,19 @@ toughness=3
 abilities=flying
 [/card]
 [card]
+text=Flying   When Sky Swallower enters the battlefield, target opponent gains control of all other permanents you control.
+id=96835
+name=Sky Swallower
+rarity=R
+mana={3}{U}{U}
+type=Creature
+subtype=Leviathan
+auto=moveTo(opponentBattlefield) all(* other|myBattlefield)
+power=8
+toughness=8
+abilities=flying
+[/card]
+[card]
 text={R}, Sacrifice a creature: Gain 1 life.
 id=107692
 name=Starved Rusalka
diff --git a/projects/mtg/bin/Res/sets/GPT/todo.dat b/projects/mtg/bin/Res/sets/GPT/todo.dat
index 5c743a018..2e4a85497 100644
--- a/projects/mtg/bin/Res/sets/GPT/todo.dat
+++ b/projects/mtg/bin/Res/sets/GPT/todo.dat
@@ -885,17 +885,6 @@ text=Bloodthirst 3 (If an opponent was dealt damage this turn, this creature ent
 rarity=U
 [/card]
 [card]
-id=96835
-name=Sky Swallower
-mana={3}{U}{U}
-type=Creature
-subtype=Leviathan
-power=8
-toughness=8
-text=Flying When Sky Swallower enters the battlefield, target opponent gains control of all other permanents you control.
-rarity=R
-[/card]
-[card]
 id=96838
 name=Skyrider Trainee
 mana={4}{W}
diff --git a/projects/mtg/bin/Res/sets/SHM/_cards.dat b/projects/mtg/bin/Res/sets/SHM/_cards.dat
index 72193c3db..1a48d972c 100644
--- a/projects/mtg/bin/Res/sets/SHM/_cards.dat
+++ b/projects/mtg/bin/Res/sets/SHM/_cards.dat
@@ -798,6 +798,19 @@ toughness=5
 abilities=wither
 [/card]
 [card]
+text=Lifelink, protection from converted mana cost 3 or greater
+id=158690
+name=Mistmeadow Skulk
+rarity=U
+mana={1}{W}
+type=Creature
+subtype=Kithkin Rogue
+auto=protection from(*[manacost>=3])
+power=1
+toughness=1
+abilities=lifelink
+[/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 2efe1837b..707cf5b65 100644
--- a/projects/mtg/bin/Res/sets/SHM/todo.dat
+++ b/projects/mtg/bin/Res/sets/SHM/todo.dat
@@ -837,17 +837,6 @@ type=Instant
 mana={2}{WU}{WU}
 [/card]
 [card]
-text=Lifelink, protection from converted mana cost 3 or greater
-id=158690
-name=Mistmeadow Skulk
-rarity=U
-type=Creature
-mana={1}{W}
-power=1
-subtype=Kithkin Rogue
-toughness=1
-[/card]
-[card]
 text={2}{W}{U}: Remove target creature from the game. Return that card to play under its owner's control at end of turn.
 id=157881
 name=Mistmeadow Witch