diff --git a/projects/mtg/bin/Res/ai/baka/deck3.txt b/projects/mtg/bin/Res/ai/baka/deck3.txt
index eded0e348..88d48d34c 100644
--- a/projects/mtg/bin/Res/ai/baka/deck3.txt
+++ b/projects/mtg/bin/Res/ai/baka/deck3.txt
@@ -1,66 +1,92 @@
+#NAME:Flashback
+#DESC:Ol'good revision green/white
+#DESC:small creatures deck
+#2x Black Vise
 1097
 1097
+#2x The Rack
 1139
 1139
+#2x Cockatrice
 1238
 1238
+#2x Craw Wurm
 1239
 1239
+#2x Giant Spider
 1249
 1249
+#2x Grizzly Bears
 1250
 1250
+#2x Ironroot Treefolk
 1253
 1253
+#1x Living Lands 
 1259
+#3x Scryb Sprites
 1264
 1264
 1264
+#4x Shanodin Dryads
 1265
 1265
 1265
 1265
+#2x Thicket Basilisk
 1267
 1267
+#1x War Mammoth 
 1277
+#1x Armageddon
 1328
+#2x Benalish Hero
 1330
 1330
+#2x Castle
 1334
 1334
+#2x Crusade
 1341
 1341
+#2x Mesa Pegasus
 1354
 1354
+#2x Pearled Unicorn
 1356
 1356
+#2x Savannah Lions
 1365
 1365
+#2x Serra Angel
 1366
 1366
+#2x Wrath of God
 1372
 1372
+# Forest (RV)
+1386
+1386
+1386
 1386
 1387
-1388
-1386
+1387
+1387
 1387
 1388
-1386
-1387
 1388
-1386
-1387
 1388
+1388
+# Plains (RV)
+1395
+1395
+1395
 1395
 1396
-1397
-1395
+1396
+1396
 1396
 1397
-1395
-1396
 1397
-1395
-1396
+1397
 1397
diff --git a/projects/mtg/bin/Res/ai/baka/deck7.txt b/projects/mtg/bin/Res/ai/baka/deck7.txt
index 02186ee38..c0e39651c 100644
--- a/projects/mtg/bin/Res/ai/baka/deck7.txt
+++ b/projects/mtg/bin/Res/ai/baka/deck7.txt
@@ -9,21 +9,32 @@
 1365
 1365
 1365
-#3x Sigiled Paladin {W}{W}, first strike exalted 2/2
+#4x Sigiled Paladin {W}{W}, first strike exalted 2/2
+174958
 174958
 174958
 174958
 #4x Serra Angel
-1366
-1366
-1366
-1366
+129726
+129726
+129726
+129726
+#4 x Guardian of Akrasa {2}{W} - defender 0/4 exalted
+175103
+175103
+175103
+175103
+#3x Skyhunter Skirmisher {1}{W}{W} - flying double strike, 1/1
+129513
+129513
+129513
+#1x Paladin en-Vec {1}{W}{W} - 2/2
+129668
 #4x Crusade
 1341
 1341
 1341
 1341
-174958
 #4x Sword to plowshares
 1367
 1367
@@ -62,14 +73,3 @@
 175030
 175030
 175030
-#4 x Guardian of Akrasa {2}{W} - defender 0/4 exalted
-175103
-175103
-175103
-175103
-#4x Skyhunter Skirmisher {1}{W}{W} - flying double strike, 1/1
-129513
-129513
-129513
-#1x Paladin en-Vec {1}{W}{W} - 2/2
-129668
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/sets/10E/_cards.dat b/projects/mtg/bin/Res/sets/10E/_cards.dat
index 8bb506192..f8cfe219c 100644
--- a/projects/mtg/bin/Res/sets/10E/_cards.dat
+++ b/projects/mtg/bin/Res/sets/10E/_cards.dat
@@ -1854,19 +1854,6 @@ type=Sorcery
 mana={1}{B}{B}
 [/card]
 [card]
-text=When Ravenous Rats comes into play, target opponent discards a card.
-id=129692
-name=Ravenous Rats
-auto=discard:1 target(player)
-rarity=C
-color=Black
-type=Creature
-mana={1}{B}
-power=1
-subtype=Rat
-toughness=1
-[/card]
-[card]
 text=Return target card from your graveyard to your hand.
 target=*|myGraveyard
 auto=moveTo(myHand)
diff --git a/projects/mtg/bin/Res/sets/10E/todo.dat b/projects/mtg/bin/Res/sets/10E/todo.dat
index 1156604ee..ee5319cea 100644
--- a/projects/mtg/bin/Res/sets/10E/todo.dat
+++ b/projects/mtg/bin/Res/sets/10E/todo.dat
@@ -930,6 +930,19 @@ type=Sorcery
 mana={1}{G}
 [/card]
 [card]
+text=When Ravenous Rats comes into play, target opponent discards a card.
+id=129692
+name=Ravenous Rats
+auto=discard:1 target(player)
+rarity=C
+color=Black
+type=Creature
+mana={1}{B}
+power=1
+subtype=Rat
+toughness=1
+[/card]
+[card]
 text=First strike (This creature deals combat damage before creatures without first strike.)  At the beginning of your upkeep, sacrifice Razormane Masticore unless you discard a card.     At the beginning of your draw step, you may have Razormane Masticore deal 3 damage to target creature.
 id=106552
 name=Razormane Masticore
diff --git a/projects/mtg/bin/Res/sets/ARB/_cards.dat b/projects/mtg/bin/Res/sets/ARB/_cards.dat
index 2fd56d5bc..714190f33 100644
--- a/projects/mtg/bin/Res/sets/ARB/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ARB/_cards.dat
@@ -165,18 +165,6 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
-id=179623
-name=Sanity Gnawers
-mana={1}{B}{R}
-type=Creature
-subtype=Rat
-power=1
-toughness=1
-text=When Sanity Gnawers comes into play, target player discards a card at random.
-auto=discard:1 target(player)
-rarity=U
-[/card]
-[card]
 text=Flying, haste
 id=179594
 name=Sewn-Eye Drake
diff --git a/projects/mtg/bin/Res/sets/ARB/todo.dat b/projects/mtg/bin/Res/sets/ARB/todo.dat
index 2f5d69e7a..52f242c1e 100644
--- a/projects/mtg/bin/Res/sets/ARB/todo.dat
+++ b/projects/mtg/bin/Res/sets/ARB/todo.dat
@@ -892,6 +892,18 @@ text=Defender Plainscycling {2}, islandcycling {2} ({2}, Discard this card: Sear
 rarity=C
 [/card]
 [card]
+id=179623
+name=Sanity Gnawers
+mana={1}{B}{R}
+type=Creature
+subtype=Rat
+power=1
+toughness=1
+text=When Sanity Gnawers comes into play, target player discards a card at random.
+auto=discard:1 target(player)
+rarity=U
+[/card]
+[card]
 id=180607
 name=Sen Triplets
 mana={2}{W}{U}{B}
diff --git a/projects/mtg/bin/Res/sets/EVE/todo.dat b/projects/mtg/bin/Res/sets/EVE/todo.dat
index e4b944efd..0936668f3 100644
--- a/projects/mtg/bin/Res/sets/EVE/todo.dat
+++ b/projects/mtg/bin/Res/sets/EVE/todo.dat
@@ -523,6 +523,7 @@ mana={1}{U}
 text=Flying     {U}, Sacrifice Glen Elendra Archmage: Counter target noncreature spell.     Persist (When this creature is put into a graveyard from play, if it had no -1/-1 counters on it, return it to play under its owner's control with a -1/-1 counter on it.)
 abilities=flying
 id=157977
+auto={U}{S}:fizzle(*[-creature]|stack)
 name=Glen Elendra Archmage
 rarity=R
 type=Creature
diff --git a/projects/mtg/bin/Res/sets/MIR/_cards.dat b/projects/mtg/bin/Res/sets/MIR/_cards.dat
index dc9298559..49632dcde 100644
--- a/projects/mtg/bin/Res/sets/MIR/_cards.dat
+++ b/projects/mtg/bin/Res/sets/MIR/_cards.dat
@@ -1,16 +1,4 @@
 [card]
-text=Enchanted creature gets +1/+1 and gains flanking (whenever a creature without flanking is assigned to block this creature, the blocking creature gets -1/-1 until end of turn).
-id=3425 
-name=Agility
-target=creature
-auto=flanking
-auto=:1/1
-type=Enchantment
-subtype=Aura
-mana={1}{R}
-rarity=C
-[/card]
-[card]
 text={B}{T}: Target creature gets +1/+0 until end of turn.  {G}{T}: Target creature gets +0/+1 until end of turn.
 id=3427 
 name=Armorer Guildmage
@@ -89,19 +77,6 @@ toughness=2
 rarity=C
 [/card]
 [card]
-text=Flanking (Whenever a creature without flanking is assigned to block this creature, the blocking creature gets -1/-1 until end of turn.) {R}{R}: First strike until end of turn
-id=3433 
-name=Burning Shield Askari
-abilities=flanking
-auto={R}{R}:first strike
-type=Creature
-subtype=Human Knight
-mana={2}{R}
-power=2
-toughness=2
-rarity=C
-[/card]
-[card]
 text=Flying, protection from green
 id=3328 
 name=Cerulean Wyvern
@@ -265,19 +240,6 @@ type=Sorcery
 mana={2}{G}
 [/card]
 [card]
-text=Flanking (Whenever a creature without flanking is assigned to block this creature, the blocking creature gets -1/-1 until end of turn.) {W}: Femeref Knight gains vigilance until end of turn.
-id=3493 
-name=Femeref Knight
-abilities=flanking
-auto={W}:vigilance
-type=Creature
-subtype=Human Knight
-mana={2}{W}
-power=2
-toughness=2
-rarity=C
-[/card]
-[card]
 text=
 id=3494 
 name=Femeref Scouts
@@ -485,18 +447,6 @@ subtype=Island
 rarity=L
 [/card]
 [card]
-text=Shroud (This permanent can't be the target of spells or abilities.) Flanking (Whenever a creature without flanking blocks this creature, the blocking creature gets -1/-1 until end of turn.)
-id=3391 
-name=Jolrael's Centaur
-abilities=flanking,shroud
-type=Creature
-subtype=Centaur Archer
-mana={1}{G}{G}
-power=2
-toughness=2
-rarity=C
-[/card]
-[card]
 text={R}: Regenerate {G}: Regenerate 
 id=3540 
 name=Jungle Troll
@@ -624,18 +574,6 @@ rarity=U
 type=Land
 [/card]
 [card]
-text=Flanking (Whenever a creature without flanking is assigned to block this creature, the blocking creature gets -1/-1 until end of turn.)
-id=3504 
-name=Mtenda Herder
-abilities=flanking
-type=Creature
-subtype=Human Scout
-mana={W}
-power=1
-toughness=1
-rarity=C
-[/card]
-[card]
 text=Banding, trample
 id=3505 
 name=Noble Elephant
@@ -1055,19 +993,6 @@ toughness=2
 rarity=U
 [/card]
 [card]
-text=Flanking (Whenever a creature without flanking is assigned to block this creature, the blocking creature gets -1/-1 until end of turn.) {W}{W}: Zhalfirin Knight gains first strike until end of turn.
-id=3525 
-name=Zhalfirin Knight
-abilities=flanking
-auto={W}{W}:first strike
-type=Creature
-subtype=Human Knight
-mana={2}{W}
-power=2
-toughness=2
-rarity=C
-[/card]
-[card]
 text=Untap target nonattacking creature. It gets +1/+3 until end of turn.
 id=3477 
 name=Alarum
@@ -1092,19 +1017,6 @@ toughness=1
 rarity=U
 [/card]
 [card]
-text=Flanking (Whenever a creature without flanking is assigned to block this creature, the blocking creature gets  -1/-1 until end of turn.) {1}{B}{B}: Regenerate Cadaverous Knight.
-id=3279 
-name=Cadaverous Knight
-abilities=flanking
-type=Creature
-subtype=Zombie Knight
-auto={1}{B}{B}:regenerate
-mana={2}{B}
-power=2
-toughness=2
-rarity=C
-[/card]
-[card]
 text={T}: Add {1} to your mana pool.  {T}:Sacrifice Crystal Vein: Add {2} to your mana pool.
 id=3571 
 name=Crystal Vein
@@ -1204,19 +1116,6 @@ toughness=3
 rarity=R
 [/card]
 [card]
-text=Flanking (Whenever a creature without flanking is assigned to block this creature, the blocking creature gets -1/-1 until end of turn.) {1}{W}{W}: Target Knight creature gets +1/+1 until end of turn.
-id=3524 
-name=Zhalfirin Commander
-abilities=flanking
-type=creature
-subtype=Human Knight
-auto={1}{W}{W}:1/1 target(knight)
-mana={2}{W}
-power=2
-toughness=2
-rarity=U
-[/card]
-[card]
 text={B}{R}{T}: Shauku's Minion deals 2 damage to target white creature.
 id=3554 
 name=Shauku's Minion
diff --git a/projects/mtg/bin/Res/sets/MIR/todo.dat b/projects/mtg/bin/Res/sets/MIR/todo.dat
index de02da59f..b5d9fd609 100644
--- a/projects/mtg/bin/Res/sets/MIR/todo.dat
+++ b/projects/mtg/bin/Res/sets/MIR/todo.dat
@@ -34,13 +34,16 @@ type=Instant
 mana={2}{W}
 [/card]
 [card]
-text=Enchant creature     Enchanted creature gets +1/+1 and has flanking. (Whenever a creature without flanking blocks this creature, the blocking creature gets -1/-1 until end of turn.)
-id=3425
+text=Enchanted creature gets +1/+1 and gains flanking (whenever a creature without flanking is assigned to block this creature, the blocking creature gets -1/-1 until end of turn).
+id=3425 
 name=Agility
-rarity=C
+target=creature
+auto=flanking
+auto=:1/1
 type=Enchantment
-mana={1}{R}
 subtype=Aura
+mana={1}{R}
+rarity=C
 [/card]
 [card]
 text=Untap target nonattacking creature. It gets +1/+3 until end of turn.
@@ -336,15 +339,17 @@ subtype=Efreet
 toughness=2
 [/card]
 [card]
-text=Flanking (Whenever a creature without flanking blocks this creature, the blocking creature gets -1/-1 until end of turn.)  {R}{R}: Burning Shield Askari gains first strike until end of turn.
-id=3433
+text=Flanking (Whenever a creature without flanking is assigned to block this creature, the blocking creature gets -1/-1 until end of turn.) {R}{R}: First strike until end of turn
+id=3433 
 name=Burning Shield Askari
-rarity=C
+abilities=flanking
+auto={R}{R}:first strike
 type=Creature
+subtype=Human Knight
 mana={2}{R}
 power=2
-subtype=Human Knight
 toughness=2
+rarity=C
 [/card]
 [card]
 text=Remove a card in your hand from the game: Add {B}{B} or {G}{G} to your mana pool.
@@ -355,15 +360,17 @@ type=Enchantment
 mana={3}{B}{G}
 [/card]
 [card]
-text=Flanking (Whenever a creature without flanking blocks this creature, the blocking creature gets -1/-1 until end of turn.)  {1}{B}{B}: Regenerate Cadaverous Knight.
-id=3279
+text=Flanking (Whenever a creature without flanking is assigned to block this creature, the blocking creature gets  -1/-1 until end of turn.) {1}{B}{B}: Regenerate Cadaverous Knight.
+id=3279 
 name=Cadaverous Knight
-rarity=C
+abilities=flanking
 type=Creature
+subtype=Zombie Knight
+auto={1}{B}{B}:regenerate
 mana={2}{B}
 power=2
-subtype=Zombie Knight
 toughness=2
+rarity=C
 [/card]
 [card]
 text=Trample     {1}{G}: Canopy Dragon gains flying and loses trample until end of turn.
@@ -882,15 +889,17 @@ subtype=Human Cleric
 toughness=1
 [/card]
 [card]
-text=Flanking (Whenever a creature without flanking blocks this creature, the blocking creature gets -1/-1 until end of turn.)  {W}: Femeref Knight gains vigilance until end of turn.
-id=3493
+text=Flanking (Whenever a creature without flanking is assigned to block this creature, the blocking creature gets -1/-1 until end of turn.) {W}: Femeref Knight gains vigilance until end of turn.
+id=3493 
 name=Femeref Knight
-rarity=C
+abilities=flanking
+auto={W}:vigilance
 type=Creature
+subtype=Human Knight
 mana={2}{W}
 power=2
-subtype=Human Knight
 toughness=2
+rarity=C
 [/card]
 [card]
 text=
@@ -1382,15 +1391,16 @@ type=Instant
 mana={3}{W}{W}
 [/card]
 [card]
-text=Shroud (This permanent can't be the target of spells or abilities.)  Flanking (Whenever a creature without flanking blocks this creature, the blocking creature gets -1/-1 until end of turn.)
-id=3391
+text=Shroud (This permanent can't be the target of spells or abilities.) Flanking (Whenever a creature without flanking blocks this creature, the blocking creature gets -1/-1 until end of turn.)
+id=3391 
 name=Jolrael's Centaur
-rarity=C
+abilities=flanking,shroud
 type=Creature
+subtype=Centaur Archer
 mana={1}{G}{G}
 power=2
-subtype=Centaur Archer
 toughness=2
+rarity=C
 [/card]
 [card]
 text=You may tap or untap target artifact, creature, or land.     Draw a card at the beginning of the next turn's upkeep.
@@ -1756,15 +1766,16 @@ subtype=Griffin
 toughness=2
 [/card]
 [card]
-text=Flanking (Whenever a creature without flanking blocks this creature, the blocking creature gets -1/-1 until end of turn.)
-id=3504
+text=Flanking (Whenever a creature without flanking is assigned to block this creature, the blocking creature gets -1/-1 until end of turn.)
+id=3504 
 name=Mtenda Herder
-rarity=C
+abilities=flanking
 type=Creature
+subtype=Human Scout
 mana={W}
 power=1
-subtype=Human Scout
 toughness=1
+rarity=C
 [/card]
 [card]
 text=Whenever Mtenda Lion attacks, defending player may pay {U}. If that player does, prevent all combat damage that would be dealt by Mtenda Lion this turn.
@@ -3025,7 +3036,6 @@ power=1
 subtype=Bird
 toughness=1
 [/card]
-
 [card]
 text=Search your library for a creature card and reveal that card. Shuffle your library, then put the revealed card back on top of it.
 id=3424
@@ -3054,26 +3064,30 @@ subtype=Unicorn
 toughness=2
 [/card]
 [card]
-text=Flanking (Whenever a creature without flanking blocks this creature, the blocking creature gets -1/-1 until end of turn.)  {1}{W}{W}: Target Knight creature gets +1/+1 until end of turn.
-id=3524
+text=Flanking (Whenever a creature without flanking is assigned to block this creature, the blocking creature gets -1/-1 until end of turn.) {1}{W}{W}: Target Knight creature gets +1/+1 until end of turn.
+id=3524 
 name=Zhalfirin Commander
-rarity=U
-type=Creature
+abilities=flanking
+type=creature
+subtype=Human Knight
+auto={1}{W}{W}:1/1 target(knight)
 mana={2}{W}
 power=2
-subtype=Human Knight
 toughness=2
+rarity=U
 [/card]
 [card]
-text=Flanking (Whenever a creature without flanking blocks this creature, the blocking creature gets -1/-1 until end of turn.)  {W}{W}: Zhalfirin Knight gains first strike until end of turn.
-id=3525
+text=Flanking (Whenever a creature without flanking is assigned to block this creature, the blocking creature gets -1/-1 until end of turn.) {W}{W}: Zhalfirin Knight gains first strike until end of turn.
+id=3525 
 name=Zhalfirin Knight
-rarity=C
+abilities=flanking
+auto={W}{W}:first strike
 type=Creature
+subtype=Human Knight
 mana={2}{W}
 power=2
-subtype=Human Knight
 toughness=2
+rarity=C
 [/card]
 [card]
 text={1}{R}{R}, {T}: Search your library for a Dragon permanent card and put that card into play. Then shuffle your library. That Dragon gains haste until end of turn. At end of turn, remove it from the game.
diff --git a/projects/mtg/bin/Res/sets/ODY/_cards.dat b/projects/mtg/bin/Res/sets/ODY/_cards.dat
index e13ec675c..f6af4566f 100644
--- a/projects/mtg/bin/Res/sets/ODY/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ODY/_cards.dat
@@ -335,19 +335,6 @@ type=Sorcery
 mana={2}{B}{B}
 [/card]
 [card]
-text=Tap: Destroy target creature token. 
-id=31789
-name=Dogged Hunter
-auto={T}:destroy target(token)
-mana={2}{W}
-color=white
-type=Creature
-subtype=Human Nomad
-power=1
-toughness=1
-rarity=R
-[/card]
-[card]
 text={G},{T}, Sacrifice Druid Lyrist: Destroy target enchantment.
 id=29778
 name=Druid Lyrist
diff --git a/projects/mtg/bin/Res/sets/ODY/todo.dat b/projects/mtg/bin/Res/sets/ODY/todo.dat
index 2678b49a3..06e3ac618 100644
--- a/projects/mtg/bin/Res/sets/ODY/todo.dat
+++ b/projects/mtg/bin/Res/sets/ODY/todo.dat
@@ -612,6 +612,19 @@ type=Enchantment
 mana={1}{W}{W}
 [/card]
 [card]
+text=Tap: Destroy target creature token. 
+id=31789
+name=Dogged Hunter
+auto={T}:destroy target(token)
+mana={2}{W}
+color=white
+type=Creature
+subtype=Human Nomad
+power=1
+toughness=1
+rarity=R
+[/card]
+[card]
 text=Dreamwinder can't attack unless defending player controls an Island.     {U}, Sacrifice an Island: Target land becomes an Island until end of turn.
 id=31802
 name=Dreamwinder
diff --git a/projects/mtg/bin/Res/sets/RAV/_cards.dat b/projects/mtg/bin/Res/sets/RAV/_cards.dat
index 63cef46a9..0bb9d71c9 100644
--- a/projects/mtg/bin/Res/sets/RAV/_cards.dat
+++ b/projects/mtg/bin/Res/sets/RAV/_cards.dat
@@ -422,18 +422,6 @@ power=3
 toughness=4
 [/card]
 [card]
-text={T}: Hammerfist Giant deals 4 damage to each creature without flying and each player.
-id=83712
-auto={T}:damage:4 all(creature[-flying],player)
-name=Hammerfist Giant
-rarity=R
-type=Creature
-mana={4}{R}{R}
-power=5
-subtype=Giant Warrior
-toughness=4
-[/card]
-[card]
 text={T}: Add {U} to your mana pool.
 auto={T}:add {U}
 id=95113
@@ -714,7 +702,7 @@ type=Sorcery
 [card]
 text=({GW} can be paid with either {G} or {W}.)  {3}{G}: Put a 1/1 green Saproling creature token into play.     {3}{W}: Creatures you control get +1/+1 until end of turn.
 id=87988
-auto={3}{G}:token (saproling,creature saproling token,1/1,green)
+auto={3}{G}:token (saproling,creature saproling,1/1,green)
 auto={3}{W}:lord (creature|myinplay) 1/1
 name=Selesnya Guildmage
 rarity=U
diff --git a/projects/mtg/bin/Res/sets/RAV/todo.dat b/projects/mtg/bin/Res/sets/RAV/todo.dat
index d295f44a5..3f270229a 100644
--- a/projects/mtg/bin/Res/sets/RAV/todo.dat
+++ b/projects/mtg/bin/Res/sets/RAV/todo.dat
@@ -882,6 +882,18 @@ type=Enchantment
 mana={1}{U}{U}
 [/card]
 [card]
+text={T}: Hammerfist Giant deals 4 damage to each creature without flying and each player.
+id=83712
+auto={T}:damage:4 all(creature[-flying],player)
+name=Hammerfist Giant
+rarity=R
+type=Creature
+mana={4}{R}{R}
+power=5
+subtype=Giant Warrior
+toughness=4
+[/card]
+[card]
 text={B}{B}{B}, {T}: Destroy target land. If that land was nonbasic, untap Helldozer.
 id=88990
 name=Helldozer