diff --git a/projects/mtg/bin/Res/sets/10E/_cards.dat b/projects/mtg/bin/Res/sets/10E/_cards.dat
index ec31e190b..ad0498198 100644
--- a/projects/mtg/bin/Res/sets/10E/_cards.dat
+++ b/projects/mtg/bin/Res/sets/10E/_cards.dat
@@ -1010,6 +1010,21 @@ mana={1}{W}{W}
 type=Enchantment
 [/card]
 [card]
+text=Whenever Goblin Elite Infantry blocks or becomes blocked, it gets -1/-1 until end of turn.
+id=130380
+name=Goblin Elite Infantry
+rarity=C
+mana={1}{R}
+type=Creature
+subtype=Goblin Warrior
+auto=rampage(-1/-1,0)
+auto=rampage(1/1,1)
+auto=lord(goblin elite infantry[blocking]|mybattlefield) -1/-1
+auto=lord(other goblin elite infantry[blocking]|mybattlefield) 1/1
+power=2
+toughness=2
+[/card]
+[card]
 text=Other Goblin creatures get +1/+1 and have mountainwalk. (They're unblockable as long as defending player controls a Mountain.)
 id=129578
 name=Goblin King
diff --git a/projects/mtg/bin/Res/sets/10E/todo.dat b/projects/mtg/bin/Res/sets/10E/todo.dat
index a2bdc700c..0286092c3 100644
--- a/projects/mtg/bin/Res/sets/10E/todo.dat
+++ b/projects/mtg/bin/Res/sets/10E/todo.dat
@@ -282,18 +282,6 @@ rarity=U
 type=Land
 [/card]
 [card]
-text=Whenever Goblin Elite Infantry blocks or becomes blocked, it gets -1/-1 until end of turn.
-id=130380
-name=Goblin Elite Infantry
-#Could be coded once rampage is fixed bushido will be only a formality lot of cards have such ability but do not include the term bushido this one is an example.
-rarity=C
-type=Creature
-mana={1}{R}
-power=2
-subtype=Goblin Warrior
-toughness=2
-[/card]
-[card]
 text=Whenever a creature you control is put into a graveyard from play, each other player sacrifices a creature.
 id=129583
 name=Grave Pact
diff --git a/projects/mtg/bin/Res/sets/BOK/_cards.dat b/projects/mtg/bin/Res/sets/BOK/_cards.dat
index 55f1cd547..4ad395797 100644
--- a/projects/mtg/bin/Res/sets/BOK/_cards.dat
+++ b/projects/mtg/bin/Res/sets/BOK/_cards.dat
@@ -215,6 +215,22 @@ mana={1}{B}
 type=Instant
 [/card]
 [card]
+text=Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.)   Whenever a Samurai you control is put into a graveyard from the battlefield, you may put a +1/+1 counter on Indebted Samurai.
+id=74091
+name=Indebted Samurai
+rarity=U
+mana={3}{W}
+type=Creature
+subtype=Human Samurai
+auto=rampage(1/1,0)
+auto=rampage(-1/-1,1)
+auto=lord(indebted samurai[blocking]|mybattlefield) 1/1
+auto=lord(other indebted samurai[blocking]|mybattlefield) -1/-1
+auto=@movedTo(samurai|mygraveyard) from(myBattlefield):may counter(1/1)
+power=2
+toughness=3
+[/card]
+[card]
 text=Ire of Kaminari deals damage to target creature or player equal to the number of Arcane cards in your graveyard.
 id=74609
 target=creature,player
@@ -226,6 +242,23 @@ type=Instant
 subtype=Arcane
 [/card]
 [card]
+####Please don't correct the card name by adding a "," because then the first auto line won't work anymore and even won't work when you add an "," there, too! (0.10.1) 
+text=Isao, Enlightened Bushi can't be countered.   Bushido 2 (When this blocks or becomes blocked, it gets +2/+2 until end of turn.)   {2}: Regenerate target Samurai.
+id=74039
+name=Isao Enlightened Bushi
+rarity=R
+mana={2}{G}
+type=Legendary Creature
+subtype=Human Samurai
+auto=rampage(2/2,0)
+auto=rampage(-2/-2,1)
+auto=lord(isao enlighted bushi[blocking]|mybattlefield) 2/2
+auto={2}:regenerate target(samurai)
+power=2
+toughness=1
+abilities=nofizzle
+[/card]
+[card]
 text=Whenever an opponent casts a Spirit or Arcane spell, Ishi-Ishi, Akki Crackshot deals 2 damage to that player.
 auto=@movedto(spirit,arcane|opponentstack):damage:2 opponent
 id=74636
@@ -394,15 +427,46 @@ power=4
 toughness=4
 [/card]
 [card]
+text=Equipped creature gets +1/+0.   Equip {0} ({0}: Attach to target creature you control. Equip only as a sorcery.)
 id=74415
+auto={0}:equip
+auto=1/0
 name=Shuko
+rarity=U
 mana={1}
 type=Artifact
 subtype=Equipment
-text=Equipped creature gets +1/+0. Equip {0} ({0}: Attach to target creature you control. Equip only as a sorcery.)
-auto={0}:equip
-auto=1/0
-rarity=U
+[/card]
+[card]
+text=Flash   Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.)
+id=74545
+name=Silverstorm Samurai
+rarity=C
+mana={4}{W}{W}
+type=Creature
+subtype=Fox Samurai
+auto=rampage(1/1,0)
+auto=rampage(-1/-1,1)
+auto=lord(silverstorm samurai[blocking]|mybattlefield) 1/1
+auto=lord(other silverstorm samurai[blocking]|mybattlefield) -1/-1
+power=3
+toughness=3
+abilities=flash
+[/card]
+[card]
+text=Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.)   {T}: Takeno's Cavalry deals 1 damage to target attacking or blocking Spirit.
+id=74597
+name=Takeno's Cavalry
+rarity=C
+mana={3}{W}
+type=Creature
+subtype=Human Samurai Archer
+auto=rampage(1/1,0)
+auto=rampage(-1/-1,1)
+auto=lord(takeno's cavalry[blocking]|mybattlefield) 1/1
+auto=lord(other takeno's cavalry[blocking]|mybattlefield) -1/-1
+power=1
+toughness=1
 [/card]
 [card]
 text=Whenever you cast a Spirit or Arcane spell, you may search your library for an Aura card with enchant creature, reveal it, and put it into your hand. If you do, shuffle your library.
diff --git a/projects/mtg/bin/Res/sets/BOK/todo.dat b/projects/mtg/bin/Res/sets/BOK/todo.dat
index f95cdb49a..3562d6ebc 100644
--- a/projects/mtg/bin/Res/sets/BOK/todo.dat
+++ b/projects/mtg/bin/Res/sets/BOK/todo.dat
@@ -353,17 +353,6 @@ text=Whenever a creature enters the battlefield under your control, it gets +2/+
 rarity=R
 [/card]
 [card]
-id=74091
-name=Indebted Samurai
-mana={3}{W}
-type=Creature
-subtype=Human Samurai
-power=2
-toughness=3
-text=Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.) Whenever a Samurai you control is put into a graveyard from the battlefield, you may put a +1/+1 counter on Indebted Samurai.
-rarity=U
-[/card]
-[card]
 id=74626
 name=Ink-Eyes, Servant of Oni
 mana={4}{B}{B}
@@ -375,17 +364,6 @@ text=Ninjutsu {3}{B}{B} ({3}{B}{B}, Return an unblocked attacker you control to
 rarity=R
 [/card]
 [card]
-id=74039
-name=Isao, Enlightened Bushi
-mana={2}{G}
-type=Legendary Creature
-subtype=Human Samurai
-power=2
-toughness=1
-text=Isao, Enlightened Bushi can't be countered. Bushido 2 (When this blocks or becomes blocked, it gets +2/+2 until end of turn.) {2}: Regenerate target Samurai.
-rarity=R
-[/card]
-[card]
 id=74507
 name=Iwamori of the Open Fist
 mana={2}{G}{G}
@@ -903,7 +881,6 @@ toughness=3
 text=At the beginning of each player's upkeep, that player adds {G}{G}{G} to his or her mana pool. Until end of turn, this mana doesn't empty from that player's mana pool as steps or phases end.
 rarity=R
 [/card]
-
 [card]
 id=81997
 name=Shuriken
@@ -923,17 +900,6 @@ text=You may exile a black card with converted mana cost X from your hand rather
 rarity=R
 [/card]
 [card]
-id=74545
-name=Silverstorm Samurai
-mana={4}{W}{W}
-type=Creature
-subtype=Fox Samurai
-power=3
-toughness=3
-text=Flash Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.)
-rarity=C
-[/card]
-[card]
 id=74577
 name=Skullmane Baku
 mana={3}{B}{B}
@@ -1035,17 +1001,6 @@ text=Each player shuffles his or her hand, graveyard, and permanents he or she o
 rarity=R
 [/card]
 [card]
-id=74597
-name=Takeno's Cavalry
-mana={3}{W}
-type=Creature
-subtype=Human Samurai Archer
-power=1
-toughness=1
-text=Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.) {T}: Takeno's Cavalry deals 1 damage to target attacking or blocking Spirit.
-rarity=C
-[/card]
-[card]
 id=74095
 name=Takenuma Bleeder
 mana={2}{B}
diff --git a/projects/mtg/bin/Res/sets/CHK/_cards.dat b/projects/mtg/bin/Res/sets/CHK/_cards.dat
index 4b9537d32..d1e04f833 100644
--- a/projects/mtg/bin/Res/sets/CHK/_cards.dat
+++ b/projects/mtg/bin/Res/sets/CHK/_cards.dat
@@ -16,9 +16,8 @@ power=1
 toughness=1
 [/card]
 [card]
-text=First Strike {R}{T}: Attacking creatures gain first strike until end of turn.
+text=First Strike   {R}{T}: Attacking creatures gain first strike until end of turn.
 id=50338
-abilities=first strike
 name=Akki Coalflinger
 rarity=U
 mana={1}{R}{R}
@@ -27,6 +26,7 @@ subtype=Goblin Shaman
 auto={R}{T}:lord(creature[attacking]) first strike 
 power=2
 toughness=2
+abilities=first strike
 [/card]
 [card]
 text=When Akki Rockspeaker enters the battlefield, add {R} to your mana pool.
@@ -41,6 +41,22 @@ power=1
 toughness=1
 [/card]
 [card]
+text=Bushido 2 (When this blocks or becomes blocked, it gets +2/+2 until end of turn.)   Battle-Mad Ronin attacks each turn if able.
+id=50383
+name=Battle-Mad Ronin
+rarity=C
+mana={1}{R}
+type=Creature
+subtype=Human Samurai
+auto=rampage(2/2,0)
+auto=rampage(-2/-2,1)
+auto=lord(battle-mad ronin[blocking]|mybattlefield) 2/2
+auto=lord(other battle-mad ronin[blocking]|mybattlefield) -2/-2
+power=1
+toughness=1
+abilities=mustattack
+[/card]
+[card]
 text={T}: Ben-Ben, Akki Hermit deals damage to target attacking creature equal to the number of untapped Mountains you control.
 auto={T}:foreach(mountain[-tapped]|myBattlefield) damage:1 target(creature[attacking])
 id=79248
@@ -130,6 +146,21 @@ mana={2}{U}
 type=Sorcery
 [/card]
 [card]
+text=Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.)   {B}: Cursed Ronin gets +1/+1 until end of turn.
+id=75262
+name=Cursed Ronin
+rarity=C
+mana={3}{B}
+type=Creature
+subtype=Human Samurai
+auto=rampage(1/1,0)
+auto=rampage(-1/-1,1)
+auto=lord(cursed ronin[blocking]|mybattlefield) 1/1
+auto=lord(other cursed ronin[blocking]|mybattlefield) -1/-1
+power=1
+toughness=1
+[/card]
+[card]
 text=Creatures you control get +1/+0 and gain fear until end of turn.
 auto=lord(creature|myBattlefield) 1/0
 auto=lord(creature|myBattlefield) fear
@@ -153,6 +184,21 @@ power=3
 toughness=3
 [/card]
 [card]
+text=Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.)
+id=50440
+name=Devoted Retainer
+rarity=C
+mana={W}
+type=Creature
+subtype=Human Samurai
+auto=rampage(1/1,0)
+auto=rampage(-1/-1,1)
+auto=lord(devoted retainer[blocking]|mybattlefield) 1/1
+auto=lord(other devoted retainer[blocking]|mybattlefield) -1/-1
+power=1
+toughness=1
+[/card]
+[card]
 text=Whenever you cast a Spirit or Arcane spell, Earthshaker deals 2 damage to each creature without flying.
 auto=@movedTo(arcane,spirit|mystack):damage:2 all(creature[-flying])
 id=79214
@@ -630,6 +676,22 @@ toughness=5
 abilities=flying
 [/card]
 [card]
+text=First strike   Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.)
+id=50441
+name=Kitsune Blademaster
+rarity=C
+mana={2}{W}
+type=Creature
+subtype=Fox Samurai
+auto=rampage(1/1,0)
+auto=rampage(-1/-1,1)
+auto=lord(araba mothrider[blocking]|mybattlefield) 1/1
+auto=lord(other araba mothrider[blocking]|mybattlefield) -1/-1
+power=2
+toughness=2
+abilities=first strike
+[/card]
+[card]
 text={T}: Tap target Spirit.
 id=76652
 name=Kitsune Diviner
@@ -693,6 +755,39 @@ toughness=5
 abilities=flying
 [/card]
 [card]
+####Please don't correct the card name by adding a "," because then the first auto line won't work anymore and even won't work when you add an "," there, too! (0.10.1) 
+text=Vigilance (Attacking doesn't cause this creature to tap.)   Bushido 5 (When this blocks or becomes blocked, it gets +5/+5 until end of turn.)   Konda, Lord of Eiganjo is indestructible.
+id=78594
+name=Konda Lord of Eiganjo
+rarity=R
+mana={5}{W}{W}
+type=Legendary Creature
+subtype=Human Samurai
+auto=rampage(5/5,0)
+auto=rampage(-5/-5,1)
+auto=lord(konda lord of eiganjo[blocking]|mybattlefield) 5/5
+power=3
+toughness=3
+abilities=vigilance,indestructible
+[/card]
+[card]
+text=Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.)   As long as you control a legendary Samurai, Konda's Hatamoto gets +1/+2 and has vigilance. (Attacking doesn't cause this creature to tap.)
+id=79201
+name=Konda's Hatamoto
+rarity=U
+mana={1}{W}
+type=Creature
+subtype=Human Samurai
+auto=rampage(1/1,0)
+auto=rampage(-1/-1,1)
+auto=lord(konda's hatamoto[blocking]|mybattlefield) 1/1
+auto=lord(other konda's hatamoto[blocking]|mybattlefield) -1/-1
+auto=aslongas(samurai[legendary]|mybattlefield) 1/2
+auto=aslongas(samurai[legendary]|mybattlefield) vigilance
+power=1
+toughness=2
+[/card]
+[card]
 text=Flying
 id=75319
 name=Lantern Kami
@@ -774,6 +869,22 @@ toughness=5
 abilities=trample
 [/card]
 [card]
+text=Flying   Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.)
+id=50385
+name=Mothrider Samurai
+rarity=C
+mana={3}{W}
+type=Creature
+subtype=Human Samurai
+auto=rampage(1/1,0)
+auto=rampage(-1/-1,1)
+auto=lord(mothrider samurai[blocking]|mybattlefield) 1/1
+auto=lord(other mothrider samurai[blocking]|mybattlefield) -1/-1
+power=2
+toughness=2
+abilities=flying
+[/card]
+[card]
 id=79075
 name=Mountain
 auto={T}:Add {R}
@@ -823,7 +934,23 @@ subtype=Aura
 abilities=flash
 [/card]
 [card]
-text=Fear. Nezumi Cutthroat can't block.
+####Please don't correct the card name by adding a "," because then the first auto line won't work anymore and even won't work when you add an "," there, too! (0.10.1) 
+text=Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.)   Whenever Nagao, Bound by Honor attacks, Samurai creatures you control get +1/+1 until end of turn.
+id=79136
+name=Nagao Bound by Honor
+rarity=U
+mana={3}{W}
+type=Legendary Creature
+subtype=Human Samurai
+auto=rampage(1/1,0)
+auto=rampage(-1/-1,1)
+auto=lord(nagao bound by honor[blocking]|mybattlefield) 1/1
+auto=aslongas(nagao bound by honor[attacking]|myBattlefield) lord(samurai[attacking]|myBattlefield) 1/1
+power=3
+toughness=3
+[/card]
+[card]
+text=Fear   Nezumi Cutthroat can't block.
 id=80521
 name=Nezumi Cutthroat
 rarity=C
@@ -835,6 +962,21 @@ toughness=1
 abilities=cantblock,fear
 [/card]
 [card]
+text=Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.)
+id=50512
+name=Nezumi Ronin
+rarity=C
+mana={2}{B}
+type=Creature
+subtype=Rat Samurai
+auto=rampage(1/1,0)
+auto=rampage(-1/-1,1)
+auto=lord(nezumin ronin[blocking]|mybattlefield) 1/1
+auto=lord(other nezumi ronin[blocking]|mybattlefield) -1/-1
+power=3
+toughness=1
+[/card]
+[card]
 text=All Creatures get -1/-1.
 auto=lord(creature) -1/-1
 id=78991
@@ -844,16 +986,32 @@ mana={2}{B}{B}
 type=Legendary Enchantment
 [/card]
 [card]
+text=Equipped creature gets +2/+0 and has first strike.   Equip {3} ({3}: Attach to target creature you control. Equip only as a sorcery.)
 id=75265
-name=No-Dachi
-mana={2}
-type=Artifact
-subtype=Equipment
-text=Equipped creature gets +2/+0 and has first strike. Equip {3} ({3}: Attach to target creature you control. Equip only as a sorcery.)
 auto={3}:equip
 auto=2/0
 auto=first strike
+name=No-Dachi
 rarity=U
+mana={2}
+type=Artifact
+subtype=Equipment
+[/card]
+[card]
+text=Bushido 2 (When this blocks or becomes blocked, it gets +2/+2 until end of turn.)   {B}, Pay 5 life: Regenerate Numai Outcast.
+id=50431
+name=Numai Outcast
+rarity=U
+mana={3}{B}
+type=Creature
+subtype=Human Samurai
+auto=rampage(1/1,0)
+auto=rampage(-1/-1,1)
+auto=lord(numai outcast[blocking]|mybattlefield) 1/1
+auto=lord(other numai outcast[blocking]|mybattlefield) -1/-1
+auto={B}:regenerate && life:-5 controller
+power=1
+toughness=1
 [/card]
 [card]
 text={T}: Add {G} to your mana pool.   {G}, {T}: Target legendary Creature gets +1/+1 until end of turn.
@@ -1051,6 +1209,22 @@ subtype=Spirit
 toughness=4
 [/card]
 [card]
+text=Haste   Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.)
+id=50262
+name=Ronin Houndmaster
+rarity=C
+mana={2}{R}
+type=Creature
+subtype=Human Samurai
+auto=rampage(1/1,0)
+auto=rampage(-1/-1,1)
+auto=lord(ronin houndmaster[blocking]|mybattlefield) 1/1
+auto=lord(other ronin houndmaster[blocking]|mybattlefield) -1/-1
+power=2
+toughness=2
+abilities=haste
+[/card]
+[card]
 text={G}{G}, Sacrifice Rootrunner: Put target land on top of its owner's library.   Soulshift 3 (When this is put into a graveyard from the battlefield, you may return target Spirit card with converted mana cost 3 or less from your graveyard to your hand.)
 id=75367
 name=Rootrunner
@@ -1102,6 +1276,21 @@ power=1
 toughness=1
 [/card]
 [card]
+text=Bushido 2 (When this blocks or becomes blocked, it gets +2/+2 until end of turn.)
+id=50408
+name=Samurai Enforcers
+rarity=U
+mana={4}{W}{W}
+type=Creature
+subtype=Human Samurai
+auto=rampage(2/2,0)
+auto=rampage(-2/-2,1)
+auto=lord(samurai enforcers[blocking]|mybattlefield) 2/2
+auto=lord(other samurai enforcers[blocking]|mybattlefield) -2/-2
+power=4
+toughness=4
+[/card]
+[card]
 text=Sacrifice Scuttling Death: Target creature gets -1/-1 until end of turn.   Soulshift 4 (When this is put into a graveyard from the battlefield, you may return target Spirit card with converted mana cost 4 or less from your graveyard to your hand.)
 id=77922
 name=Scuttling Death
diff --git a/projects/mtg/bin/Res/sets/CHK/todo.dat b/projects/mtg/bin/Res/sets/CHK/todo.dat
index 1498eda0d..68724fd1b 100644
--- a/projects/mtg/bin/Res/sets/CHK/todo.dat
+++ b/projects/mtg/bin/Res/sets/CHK/todo.dat
@@ -76,17 +76,6 @@ text=You may play two additional lands on each of your turns.
 rarity=R
 [/card]
 [card]
-id=50383
-name=Battle-Mad Ronin
-mana={1}{R}
-type=Creature
-subtype=Human Samurai
-power=1
-toughness=1
-text=Bushido 2 (When this blocks or becomes blocked, it gets +2/+2 until end of turn.) Battle-Mad Ronin attacks each turn if able.
-rarity=C
-[/card]
-[card]
 text=Destroy target land or nonblack creature. It can't be regenerated.
 target=creature[-black],land
 #That kind of targetting is not suppoert in Wagic 0.9
@@ -254,17 +243,6 @@ text=Crushing Pain deals 6 damage to target creature that was dealt damage this
 rarity=C
 [/card]
 [card]
-id=75262
-name=Cursed Ronin
-mana={3}{B}
-type=Creature
-subtype=Human Samurai
-power=1
-toughness=1
-text=Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.) {B}: Cursed Ronin gets +1/+1 until end of turn.
-rarity=C
-[/card]
-[card]
 id=79229
 name=Cut the Tethers
 mana={2}{U}{U}
@@ -291,17 +269,6 @@ text=Add {R}{R}{R} to your mana pool. Splice onto Arcane {1}{R} (As you play an
 rarity=C
 [/card]
 [card]
-id=50440
-name=Devoted Retainer
-mana={W}
-type=Creature
-subtype=Human Samurai
-power=1
-toughness=1
-text=Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.)
-rarity=C
-[/card]
-[card]
 id=79151
 name=Devouring Greed
 mana={2}{B}{B}
@@ -822,17 +789,6 @@ text={2}{B}{B}, {T}: Target creature deals damage to itself equal to its power.
 rarity=R
 [/card]
 [card]
-id=50441
-name=Kitsune Blademaster
-mana={2}{W}
-type=Creature
-subtype=Fox Samurai
-power=2
-toughness=2
-text=First strike Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.)
-rarity=C
-[/card]
-[card]
 id=50437
 name=Kitsune Healer
 mana={3}{W}
@@ -873,20 +829,6 @@ text=Search your library for two basic land cards, reveal those cards, and put o
 rarity=C
 [/card]
 [card]
-id=78594
-name=Konda, Lord of Eiganjo
-mana={5}{W}{W}
-type=Creature
-subtype=Human Samurai
-power=3
-toughness=3
-abilities=Legendary,vigilance,indestructible
-auto=rampage(5/5,0)
-auto=aslongas(Konda, Lord of Eiganjo[blocking]|myinplay) 5/5
-text=Vigilance (Attacking doesn't cause this creature to tap.) Bushido 5 (When this blocks or becomes blocked, it gets +5/+5 until end of turn.) Konda, Lord of Eiganjo is indestructible.
-rarity=R
-[/card]
-[card]
 id=76637
 name=Konda's Banner
 mana={2}
@@ -896,17 +838,6 @@ text=Konda's Banner can be attached only to a legendary creature. Creatures that
 rarity=R
 [/card]
 [card]
-id=79201
-name=Konda's Hatamoto
-mana={1}{W}
-type=Creature
-subtype=Human Samurai
-power=1
-toughness=2
-text=Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.) As long as you control a legendary Samurai, Konda's Hatamoto gets +1/+2 and has vigilance. (Attacking doesn't cause this creature to tap.)
-rarity=U
-[/card]
-[card]
 id=78964
 name=Kumano, Master Yamabushi
 mana={3}{R}{R}
@@ -1029,17 +960,6 @@ text=Whenever you draw a card, remove the top card of your library from the game
 rarity=R
 [/card]
 [card]
-id=50385
-name=Mothrider Samurai
-mana={3}{W}
-type=Creature
-subtype=Human Samurai
-power=2
-toughness=2
-text=Flying Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.)
-rarity=C
-[/card]
-[card]
 id=78681
 name=Myojin of Cleansing Fire
 mana={5}{W}{W}{W}
@@ -1095,17 +1015,6 @@ text=Myojin of Seeing Winds comes into play with a divinity counter on it if you
 rarity=R
 [/card]
 [card]
-id=79136
-name=Nagao, Bound by Honor
-mana={3}{W}
-type=Legendary Creature
-subtype=Human Samurai
-power=3
-toughness=3
-text=Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.) Whenever Nagao, Bound by Honor attacks, Samurai creatures you control get +1/+1 until end of turn.
-rarity=U
-[/card]
-[card]
 id=80527
 name=Nature's Will
 mana={2}{G}{G}
@@ -1135,17 +1044,6 @@ toughness=1
 text={1}{B}: Remove target card in an opponent's graveyard from the game. If no cards are in that graveyard, flip Nezumi Graverobber. rarity=U
 [/card]
 [card]
-id=50512
-name=Nezumi Ronin
-mana={2}{B}
-type=Creature
-subtype=Rat Samurai
-power=3
-toughness=1
-text=Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.)
-rarity=C
-[/card]
-[card]
 id=78679
 name=Nezumi Shortfang
 mana={1}{B}
@@ -1172,17 +1070,6 @@ text={T}: Nine-Ringed Bo deals 1 damage to target Spirit creature. If that creat
 rarity=U
 [/card]
 [card]
-id=50431
-name=Numai Outcast
-mana={3}{B}
-type=Creature
-subtype=Human Samurai
-power=1
-toughness=1
-text=Bushido 2 (When this blocks or becomes blocked, it gets +2/+2 until end of turn.) {B}, Pay 5 life: Regenerate Numai Outcast.
-rarity=U
-[/card]
-[card]
 id=50484
 name=Oathkeeper, Takeno's Daisho
 mana={3}
@@ -1362,28 +1249,6 @@ text=Target permanent's controller sacrifices it. If he or she does, that player
 rarity=R
 [/card]
 [card]
-id=50262
-name=Ronin Houndmaster
-mana={2}{R}
-type=Creature
-subtype=Human Samurai
-power=2
-toughness=2
-text=Haste Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.)
-rarity=C
-[/card]
-[card]
-id=50408
-name=Samurai Enforcers
-mana={4}{W}{W}
-type=Creature
-subtype=Human Samurai
-power=4
-toughness=4
-text=Bushido 2 (When this blocks or becomes blocked, it gets +2/+2 until end of turn.)
-rarity=U
-[/card]
-[card]
 id=75381
 name=Samurai of the Pale Curtain
 mana={W}{W}
diff --git a/projects/mtg/bin/Res/sets/EXO/_cards.dat b/projects/mtg/bin/Res/sets/EXO/_cards.dat
index cd5608195..27798b567 100644
--- a/projects/mtg/bin/Res/sets/EXO/_cards.dat
+++ b/projects/mtg/bin/Res/sets/EXO/_cards.dat
@@ -422,27 +422,28 @@ mana={1}{R}
 type=Instant
 [/card]
 [card]
-text=Whenever Pygmy Troll becomes blocked, it gets +1/+1 until end of turn for each creature blocking it.   {G}: Regenerate Pygmy Troll.
+text=Whenever Pygmy Troll becomes blocked by a creature, Pygmy Troll gets +1/+1 until end of turn.   {G}: Regenerate Pygmy Troll.
 id=6131
-auto=rampage(1/1,0)
-auto={G}:regenerate
 name=Pygmy Troll
 rarity=C
 mana={1}{G}
 type=Creature
 subtype=Troll
+auto=rampage(1/1,0)
+auto=rampage(-1/-1,1)
+auto={G}:regenerate
 power=1
 toughness=1
 [/card]
 [card]
-text=Whenever Rabid Wolverines becomes blocked, it gets +1/+1 until end of turn for each creature blocking it.
+text=Whenever Rabid Wolverines becomes blocked by a creature, Pygmy Troll gets +1/+1 until end of turn.
 id=6134
-auto=rampage(1/1,0)
 name=Rabid Wolverines
 rarity=C
 mana={3}{G}{G}
 type=Creature
 subtype=Wolverine
+auto=rampage(1/1,0)
 power=4
 toughness=4
 [/card]
diff --git a/projects/mtg/bin/Res/sets/ICE/_cards.dat b/projects/mtg/bin/Res/sets/ICE/_cards.dat
index bdec4a946..ac409dffb 100644
--- a/projects/mtg/bin/Res/sets/ICE/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ICE/_cards.dat
@@ -177,6 +177,21 @@ power=3
 toughness=2
 [/card]
 [card]
+text=Whenever Chub Toad blocks or becomes blocked, it gets +2/+2 until end of turn.
+id=2553
+name=Chub Toad
+rarity=C
+mana={2}{G}
+type=Creature
+subtype=Frog
+auto=rampage(2/2,0)
+auto=rampage(-2/-2,1)
+auto=lord(chub toad[blocking]|mybattlefield) 2/2
+auto=lord(other chub toad[blocking]|mybattlefield) -2/-2
+power=1
+toughness=1
+[/card]
+[card]
 text={1}: The next time a black source of your choice would deal damage to you this turn, prevent that damage.
 id=2672
 alias=1335
diff --git a/projects/mtg/bin/Res/sets/ICE/todo.dat b/projects/mtg/bin/Res/sets/ICE/todo.dat
index 33ea3e602..4dd411469 100644
--- a/projects/mtg/bin/Res/sets/ICE/todo.dat
+++ b/projects/mtg/bin/Res/sets/ICE/todo.dat
@@ -329,19 +329,6 @@ mana={1}{W}{U}
 subtype=Aura
 [/card]
 [card]
-text=Whenever Chub Toad blocks or becomes blocked, it gets +2/+2 until end of turn.
-id=2553
-auto=bushido(2/2)
-#Could be added when budshido is implemented
-name=Chub Toad
-rarity=C
-type=Creature
-mana={2}{G}
-power=1
-subtype=Frog
-toughness=1
-[/card]
-[card]
 text=Look at target player's hand.       Draw a card at the beginning of the next turn's upkeep.
 id=2499
 name=Clairvoyance
diff --git a/projects/mtg/bin/Res/sets/MIR/_cards.dat b/projects/mtg/bin/Res/sets/MIR/_cards.dat
index fd2e9b9ec..1d89eb3d3 100644
--- a/projects/mtg/bin/Res/sets/MIR/_cards.dat
+++ b/projects/mtg/bin/Res/sets/MIR/_cards.dat
@@ -5,11 +5,11 @@ block=Mirage
 [/meta]
 [card]
 text=Untap target nonattacking creature. It gets +1/+3 until end of turn.
-id=3477 
-name=Alarum
+id=3477
 target=creature[-attacking]
 auto=untap
 auto=1/3
+name=Alarum
 rarity=C
 mana={1}{W}
 type=Instant
@@ -25,7 +25,7 @@ type=Artifact
 [/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 
+id=3427
 name=Armorer Guildmage
 rarity=C
 mana={R}
@@ -38,10 +38,10 @@ toughness=1
 [/card]
 [card]
 text=Put target creature card from an opponent's graveyard onto the battlefield under your control.
-id=3273 
-name=Ashen Powder
+id=3273
 target=creature|opponentgraveyard
 auto=moveTo(myBattlefield)
+name=Ashen Powder
 rarity=R
 mana={2}{B}{B}
 type=Sorcery
@@ -61,10 +61,10 @@ abilities=flying
 [/card]
 [card]
 text=Bad River enters the battlefield tapped.   {T}, Sacrifice Bad River: Search your library for an Island or Swamp card and put it on the battlefield. Then shuffle your library.
-auto=tap
-auto={T}{S}:moveTo(myBattlefield) target(island,swamp|myLibrary)
 id=3570
 name=Bad River
+auto=tap
+auto={T}{S}:moveTo(myBattlefield) target(island,swamp|myLibrary)
 rarity=U
 type=Land
 [/card]
@@ -81,7 +81,7 @@ type=Instant
 [/card]
 [card]
 text=Flying, vigilance
-id=3325 
+id=3325
 name=Bay Falcon
 rarity=C
 mana={1}{U}
@@ -93,13 +93,13 @@ abilities=flying,vigilance
 [/card]
 [card]
 text=Islandwalk   At the beginning of your upkeep, you lose 2 life.
-auto=@each my upkeep:life:-2
 id=3528
 name=Benthic Djinn
 rarity=R
 mana={2}{U}{B}
 type=Creature
 subtype=Djinn
+auto=@each my upkeep:life:-2
 power=5
 toughness=3
 abilities=islandwalk
@@ -128,19 +128,19 @@ type=Sorcery
 [/card]
 [card]
 text={1}{R}{R}: Burning Palm Efreet deals 2 damage to target creature with flying and that creature loses flying until end of turn.
-auto={1}{R}{R}:damage:2 && -flying target(creature[flying])
 id=3432
 name=Burning Palm Efreet
 rarity=U
 mana={2}{R}{R}
 type=Creature
 subtype=Efreet
+auto={1}{R}{R}:damage:2 && -flying target(creature[flying])
 power=2
 toughness=2
 [/card]
 [card]
 text=Defender (This creature can't attack.)
-id=3430 
+id=3430
 name=Blistering Barrier
 rarity=C
 mana={2}{R}
@@ -152,10 +152,10 @@ abilities=defender
 [/card]
 [card]
 text=Return target permanent to owner's hand.
-id=3327 
-name=Boomerang
+id=3327
 target=*
 auto=moveTo(ownerhand)
+name=Boomerang
 rarity=C
 mana={U}{U}
 type=Instant
@@ -173,6 +173,21 @@ power=2
 toughness=2
 [/card]
 [card]
+text=Whenever Brushwagg blocks or becomes blocked, it gets -2/+2 until end of turn.
+id=3377
+name=Brushwagg
+rarity=R
+mana={1}{G}{G}
+type=Creature
+subtype=Brushwagg
+auto=rampage(-2/2,0)
+auto=rampage(2/-2,1)
+auto=lord(brushwagg[blocking]|mybattlefield) -2/2
+auto=lord(other brushwagg[blocking]|mybattlefield) 2/-2
+power=3
+toughness=2
+[/card]
+[card]
 text=Remove a card in your hand from the game: Add {B}{B} or {G}{G} to your mana pool.
 auto={0}:moveTo(exile) target(*|myhand) && add{B}{B} controller
 auto={0}:moveTo(exile) target(*|myhand) && add{G}{G} controller
@@ -197,26 +212,26 @@ abilities=trample
 [/card]
 [card]
 text=Flying, protection from green
-id=3328 
+id=3328
 name=Cerulean Wyvern
-type=Creature
-subtype=Drake
 rarity=U
 mana={4}{U}
+type=Creature
+subtype=Drake
 power=3
 toughness=3
 abilities=flying,protection from green
 [/card]
 [card]
 text=Choose one - Destroy target Wall; or Chaos Charm deals 1 damage to target creature; or target creature gains haste until end of turn.
+id=3434
 auto=may destroy target(wall)
 auto=may damage:1 target(creature)
 auto=may haste target(creature)
-id=3434
 name=Chaos Charm
 rarity=C
-type=Instant
 mana={R}
+type=Instant
 [/card]
 [card]
 text=Creatures with flying have "This creature can't block creatures without flying."   Creatures without flying have reach. (They can block creatures with flying.)
@@ -231,7 +246,7 @@ type=World Enchantment
 [/card]
 [card]
 text=Charcoal Diamond enters the battlefield tapped.   {T}: Add {B} to your mana pool.
-id=3244 
+id=3244
 name=Charcoal Diamond
 auto=tap
 auto={T}:Add {B}
@@ -254,7 +269,7 @@ toughness=1
 [/card]
 [card]
 text=Trample
-id=3379 
+id=3379
 name=Crash of Rhinos
 rarity=C
 mana={6}{G}{G}
@@ -266,7 +281,7 @@ abilities=trample
 [/card]
 [card]
 text={T}: Add {1} to your mana pool.   {T}:Sacrifice Crystal Vein: Add {2} to your mana pool.
-id=3571 
+id=3571
 name=Crystal Vein
 auto={T}:Add {1}
 auto={T}{S}:Add {2}
@@ -287,18 +302,18 @@ toughness=1
 [/card]
 [card]
 text=Destroy target nonblack creature. It can't be regenerated.
-id=3284 
-name=Dark Banishing
+id=3284
 target=creature[-black]
 auto=bury
+name=Dark Banishing
 rarity=C
 mana={2}{B}
 type=Instant
 [/card]
 [card]
 text=Add {B}{B}{B} to your mana pool.
-auto=Add{B}{B}{B}
 id=3285
+auto=Add{B}{B}{B}
 name=Dark Ritual
 rarity=C
 mana={B}
@@ -306,7 +321,7 @@ type=Instant
 [/card]
 [card]
 text=Swampwalk    {B}: Dirtwater Wraith gets +1/+0 until end of turn.
-id=3286 
+id=3286
 name=Dirtwater Wraith
 rarity=C
 mana={3}{B}
@@ -319,8 +334,9 @@ abilities=swampwalk
 [/card]
 [card]
 text=Put target artifact or enchantment on top of its owner's library.
-auto=moveTo(ownerLibrary) target(artifact,enchantment)
 id=3484
+target=artifact,enchantment
+auto=moveTo(ownerLibrary)
 name=Disempower
 rarity=C
 mana={1}{W}
@@ -328,7 +344,7 @@ type=Instant
 [/card]
 [card]
 text=Destroy target artifact or enchantment.
-id=3485 
+id=3485
 name=Disenchant
 target=artifact,enchantment
 auto=destroy
@@ -364,25 +380,25 @@ rarity=C
 [/card]
 [card]
 text={2}{R}, {T}: Destroy target nonbasic land.
-auto={2}{R}{T}:destroy target(land[-basic])
 id=3440
 name=Dwarven Miner
 rarity=U
 mana={1}{R}
 type=Creature
 subtype=Dwarf
+auto={2}{R}{T}:destroy target(land[-basic])
 power=1
 toughness=2
 [/card]
 [card]
 text={T}: Target creature with power 2 or less is unblockable this turn.
-id=3441 
+id=3441
 name=Dwarven Nomad
-auto={T}:unblockable target(creature[power<=2])
-type=Creature
-subtype=Dwarf Nomad
 rarity=C
 mana={2}{R}
+type=Creature
+subtype=Dwarf Nomad
+auto={T}:unblockable target(creature[power<=2])
 power=1
 toughness=1
 [/card]
@@ -400,7 +416,7 @@ toughness=4
 [/card]
 [card]
 text=Flying, first strike
-id=3488 
+id=3488
 name=Ekundu Griffin
 rarity=C
 mana={3}{W}
@@ -412,7 +428,7 @@ abilities=flying,first strike
 [/card]
 [card]
 text=Elixir of Vitality enters the battlefield tapped.   {T}:Sacrifice Elixir of Vitality: Gain 4 life.  8, {T}:Sacrifice Elixir of Vitality: Gain 8 life.
-id=3248 
+id=3248
 name=Elixir of Vitality
 type=Artifact
 auto=tap
@@ -433,10 +449,10 @@ type=Sorcery
 [/card]
 [card]
 text=Enchant creature (Target a creature as you cast this. This card enters the battlefield attached to that creature.)   Enchanted creature gets -2/-2.
-id=3290 
-name=Enfeeblement
+id=3290
 target=creature
 auto=-2/-2
+name=Enfeeblement
 rarity=C
 mana={B}{B}
 type=Enchantment
@@ -444,15 +460,16 @@ subtype=Aura
 [/card]
 [card]
 text=Put target land on top of its owner's library.
-auto=moveTo(ownerLibrary) target(land)
 id=3383
+target=land
+auto=moveTo(ownerLibrary) 
 name=Fallow Earth
 rarity=U
 mana={2}{G}
 type=Sorcery
 [/card]
 [card]
-id=3494 
+id=3494
 name=Femeref Scouts
 rarity=C
 mana={2}{W}
@@ -463,7 +480,7 @@ toughness=4
 [/card]
 [card]
 text=Flying 
-id=3291 
+id=3291
 name=Feral Shadow
 rarity=C
 mana={2}{B}
@@ -475,7 +492,7 @@ abilities=flying
 [/card]
 [card]
 text={T}: Femeref Archers deals 4 damage to target attacking creature with flying.
-id=3384 
+id=3384
 name=Femeref Archers
 rarity=U
 mana={2}{G}
@@ -487,19 +504,19 @@ toughness=2
 [/card]
 [card]
 text={B}: Fetid Horror gets +1/+1 until end of turn.
-id=3292 
+id=3292
 name=Fetid Horror
-auto={B}:1/1
+rarity=C
+mana={3}{B}
 type=Creature
 subtype=Shade Horror
-mana={3}{B}
+auto={B}:1/1
 power=1
 toughness=2
-rarity=C
 [/card]
 [card]
 text=Fire Diamond enters the battlefield tapped.   {T}: Add {R} to your mana pool. Play this ability as a mana source.
-id=3250 
+id=3250
 name=Fire Diamond
 rarity=U
 mana={2}
@@ -509,10 +526,10 @@ type=Artifact
 [/card]
 [card]
 text=Enchant creature (Target a creature as you cast this. This card enters the battlefield attached to that creature.)   {R}: Enchanted creature gets +1/+0 until end of turn.
-id=3445 
-name=Firebreathing
+id=3445
 target=creature
 auto={R}:1/0
+name=Firebreathing
 rarity=C
 mana={R}
 type=Enchantment
@@ -520,20 +537,20 @@ subtype=Aura
 [/card]
 [card]
 text=Flare deals 1 damage to target creature or player.   Draw a card at the beginning of the next turn's upkeep.
-id=3447 
-name=Flare
+id=3447
 auto=damage:1 target(creature,player)
 auto=@next upkeep:draw:1 controller
+name=Flare
 rarity=C
 mana={2}{R}
 type=Instant
 [/card]
 [card]
 text=Flood Plain enters the battlefield tapped.   {T}, Sacrifice Flood Plain: Search your library for a Plains or Island card and put it into play. Then shuffle your library.
-auto=tap
-auto={T}{S}:moveTo(myBattlefield) target(plains,island|myLibrary)
 id=3572
 name=Flood Plain
+auto=tap
+auto={T}{S}:moveTo(myBattlefield) target(plains,island|myLibrary)
 rarity=U
 type=Land
 [/card]
@@ -548,7 +565,7 @@ type=Instant
 [/card]
 [card]
 text={G}, Sacrifice a Forest: Foratog gets +2/+2 until end of turn.
-id=3386 
+id=3386
 name=Foratog
 rarity=U
 mana={2}{G}
@@ -560,7 +577,7 @@ toughness=2
 [/card]
 [card]
 text={T}: Add {G} to your mana pool.
-id=3566 
+id=3566
 name=Forest
 auto={T}:Add {G}
 type=Basic Land
@@ -578,7 +595,7 @@ rarity=L
 [/card]
 [card]
 text={T}: Add {G} to your mana pool.
-id=3568 
+id=3568
 name=Forest
 auto={T}:Add {G}
 type=Basic Land
@@ -596,7 +613,7 @@ rarity=L
 [/card]
 [card]
 text=Reach (This creature can block creatures with flying.)
-id=3387 
+id=3387
 name=Giant Mantis
 rarity=C
 mana={3}{G}
@@ -619,13 +636,28 @@ power=3
 toughness=2
 [/card]
 [card]
+text=Whenever Goblin Elite Infantry blocks or becomes blocked, it gets -1/-1 until end of turn.
+id=3448
+name=Goblin Elite Infantry
+rarity=C
+mana={1}{R}
+type=Creature
+subtype=Goblin Warrior
+auto=rampage(-1/-1,0)
+auto=rampage(1/1,1)
+auto=lord(goblin elite infantry[blocking]|mybattlefield) -1/-1
+auto=lord(other goblin elite infantry[blocking]|mybattlefield) 1/1
+power=2
+toughness=2
+[/card]
+[card]
 text=Put three 1/1 red Goblin Scout creature tokens with mountainwalk onto the battlefield.
-id=3449 
+id=3449
 name=Goblin Scouts
-type=Sorcery
 auto=token(Goblin Scout,creature token Goblin Scout, 1/1,mountainwalk red)*3
 rarity=U
 mana={3}{R}{R}
+type=Sorcery
 [/card]
 [card]
 text={R}, {T}, Sacrifice a Goblin: Red creatures get +1/+1 until end of turn.
@@ -654,10 +686,10 @@ toughness=1
 [/card]
 [card]
 text=Grasslands enters the battlefield tapped.   {T}, Sacrifice Grasslands: Search your library for a Forest or Plains card and put it into play. Then shuffle your library.
-auto=tap
-auto={T}{S}:moveTo(myBattlefield) target(plains,forest|myLibrary)
 id=3573
 name=Grasslands
+auto=tap
+auto={T}{S}:moveTo(myBattlefield) target(plains,forest|myLibrary)
 rarity=U
 type=Land
 [/card]
@@ -674,19 +706,19 @@ type=Sorcery
 [/card]
 [card]
 text=At the beginning of your upkeep, put a -1/-1 counter on each creature.
-auto=@each my upkeep:all(creature) counter(-1/-1)
 id=3297
 name=Harbinger of Night
 rarity=R
 mana={2}{B}{B}
 type=Creature
 subtype=Spirit
+auto=@each my upkeep:all(creature) counter(-1/-1)
 power=2
 toughness=3
 [/card]
 [card]
 text=Flying   {1}{U}{U}: Target creature gains flying until end of turn.
-id=3340 
+id=3340
 name=Harmattan Efreet
 rarity=U
 mana={2}{U}{U}
@@ -698,7 +730,7 @@ toughness=2
 abilities=flying
 [/card]
 [card]
-text=Flying. As Haunting Apparition enters the battlefield, choose an opponent. Haunting Apparition's power is equal to 1 plus the number of green creature cards in the chosen player's graveyard.
+text=Flying   As Haunting Apparition enters the battlefield, choose an opponent. Haunting Apparition's power is equal to 1 plus the number of green creature cards in the chosen player's graveyard.
 id=3538
 name=Haunting Apparition
 rarity=U
@@ -712,7 +744,7 @@ abilities=flying
 [/card]
 [card]
 text=Flying, protection from red
-id=3539 
+id=3539
 name=Hazerider Drake
 rarity=U
 mana={2}{W}{U}
@@ -724,7 +756,7 @@ abilities=flying,protection from red
 [/card]
 [card]
 text=Rampage 1 (For each creature assigned to block it beyond the first, this creature gets +1/+1 until end of turn.)
-id=3252 
+id=3252
 name=Horrible Hordes
 rarity=U
 mana={3}
@@ -736,7 +768,7 @@ toughness=2
 [/card]
 [card]
 text={2}: Igneous Golem gains trample until end of turn.
-id=3253 
+id=3253
 name=Igneous Golem
 rarity=U
 mana={5}
@@ -759,7 +791,7 @@ type=Instant
 [/card]
 [card]
 text=Trample
-id=3497 
+id=3497
 name=Iron Tusk Elephant
 rarity=U
 mana={4}{W}
@@ -780,7 +812,7 @@ rarity=L
 [/card]
 [card]
 text={T}: Add {U} to your mana pool.
-id=3582 
+id=3582
 name=Island
 auto={T}:Add {U}
 type=Basic Land
@@ -789,7 +821,7 @@ rarity=L
 [/card]
 [card]
 text={T}: Add {U} to your mana pool.
-id=3583 
+id=3583
 name=Island
 auto={T}:Add {U}
 type=Basic Land
@@ -798,7 +830,7 @@ rarity=L
 [/card]
 [card]
 text={T}: Add {U} to your mana pool.
-id=3584 
+id=3584
 name=Island
 auto={T}:Add {U}
 type=Basic Land
@@ -831,7 +863,7 @@ toughness=2
 [/card]
 [card]
 text={R}: Regenerate Jungle Troll.  {G}: Regenerate Jungle Troll.
-id=3540 
+id=3540
 name=Jungle Troll
 rarity=U
 mana={1}{R}{G}
@@ -844,28 +876,28 @@ toughness=1
 [card]
 text=Whenever Jungle Wurm becomes blocked, it gets -1/-1 until end of turn for each creature blocking it beyond the first.
 id=3393
-auto=rampage(-1/-1,1)
 name=Jungle Wurm
 rarity=C
 mana={3}{G}{G}
 type=Creature
 subtype=Wurm
+auto=rampage(-1/-1,1)
 power=5
 toughness=5
 [/card]
 [card]
 text=Kaervek's Hex deals 1 damage to each nonblack creature and an additional 1 damage to each green creature.
 id=3299
-name=Kaervek's Hex
 auto=damage:1 all(creature[-black])
 auto=damage:1 all(creature[green])
+name=Kaervek's Hex
 type=Sorcery
 rarity=U
 mana={3}{B}
 [/card]
 [card]
 text=Protection from blue
-id=3394 
+id=3394
 name=Karoo Meerkat
 rarity=U
 mana={1}{G}
@@ -876,7 +908,7 @@ toughness=1
 abilities=protection from blue
 [/card]
 [card]
-text=Flying.   {T}: Leering Gargoyle gets -2/+2 and loses flying until end of turn.
+text=Flying   {T}: Leering Gargoyle gets -2/+2 and loses flying until end of turn.
 id=3542
 name=Leering Gargoyle
 rarity=R
@@ -917,7 +949,7 @@ abilities=flying
 [/card]
 [card]
 text={T}: Add {1} to your mana pool.   {1}{T}: Add one mana of any color to your mana pool.
-id=3256 
+id=3256
 name=Mana Prism
 rarity=U
 mana={3}
@@ -931,7 +963,7 @@ type=Artifact
 [/card]
 [card]
 text=Marble Diamond enters the battlefield tapped.   {T}: Add {W} to your mana pool.
-id=3258 
+id=3258
 name=Marble Diamond
 auto=tap
 auto={T}:Add {W}
@@ -953,7 +985,7 @@ toughness=*
 [/card]
 [card]
 text=Flying, protection from black
-id=3502 
+id=3502
 name=Melesse Spirit
 rarity=U
 mana={3}{W}{W}
@@ -986,7 +1018,7 @@ type=Artifact
 [/card]
 [card]
 text=Moss Diamond enters the battlefield tapped.   {T}: Add {G} to your mana pool. 
-id=3260 
+id=3260
 name=Moss Diamond
 auto=tap
 auto={T}:Add {G}
@@ -996,7 +1028,7 @@ rarity=U
 [/card]
 [card]
 text={T}: Add {R} to your mana pool.
-id=3577 
+id=3577
 name=Mountain
 auto={T}:Add {R}
 type=Basic Land
@@ -1005,7 +1037,7 @@ rarity=L
 [/card]
 [card]
 text={T}: Add {R} to your mana pool.
-id=3578 
+id=3578
 name=Mountain
 auto={T}:Add {R}
 type=Basic Land
@@ -1014,7 +1046,7 @@ rarity=L
 [/card]
 [card]
 text={T}: Add {R} to your mana pool.
-id=3579 
+id=3579
 name=Mountain
 auto={T}:Add {R}
 type=Basic Land
@@ -1023,7 +1055,7 @@ rarity=L
 [/card]
 [card]
 text={T}: Add {R} to your mana pool.
-id=3580 
+id=3580
 name=Mountain
 auto={T}:Add {R}
 type=Basic Land
@@ -1032,10 +1064,10 @@ rarity=L
 [/card]
 [card]
 text=Mountain Valley enters the battlefield tapped.   {T}, Sacrifice Mountain Valley: Search your library for a Mountain or Forest card and put it into play. Then shuffle your library.
-auto=tap
-auto={T}{S}:moveTo(myBattlefield) target(mountain,forest|myLibrary)
 id=3574
 name=Mountain Valley
+auto=tap
+auto={T}{S}:moveTo(myBattlefield) target(mountain,forest|myLibrary)
 rarity=U
 type=Land
 [/card]
@@ -1056,19 +1088,19 @@ abilities=flying
 text=At the beginning of your upkeep, Nettletooth Djinn deals 1 damage to you.
 id=3401
 name=Nettletooth Djinn
-type=Creature
-subtype=Djinn
 rarity=U
 mana={3}{G}
+type=Creature
+subtype=Djinn
 auto=@each my upkeep:damage:1 controller
 power=4
 toughness=4
 [/card]
 [card]
 text=Black creatures get +2/+0 until end of turn.
-id=3301 
-name=Nocturnal Raid
+id=3301
 auto=lord(creature[black]) 2/0
+name=Nocturnal Raid
 rarity=U
 mana={2}{B}{B}
 type=Instant
@@ -1087,7 +1119,7 @@ subtype=Aura
 [/card]
 [card]
 text={3}: Patagia Golem gains flying until end of turn.
-id=3261 
+id=3261
 name=Patagia Golem
 rarity=U
 mana={4}
@@ -1108,7 +1140,7 @@ type=Artifact
 [/card]
 [card]
 text=Flying   {1}{W}: Pearl Dragon gets +0/+1 until end of turn.
-id=3508 
+id=3508
 name=Pearl Dragon
 rarity=R
 mana={4}{W}{W}
@@ -1130,7 +1162,7 @@ type=Artifact
 [/card]
 [card]
 text={T}: Add {W} to your mana pool.
-id=3585 
+id=3585
 name=Plains
 auto={T}:Add {W}
 type=Basic Land
@@ -1139,7 +1171,7 @@ rarity=L
 [/card]
 [card]
 text={T}: Add {W} to your mana pool.
-id=3586 
+id=3586
 name=Plains
 auto={T}:Add {W}
 type=Basic Land
@@ -1148,7 +1180,7 @@ rarity=L
 [/card]
 [card]
 text={T}: Add {W} to your mana pool.
-id=3587 
+id=3587
 name=Plains
 auto={T}:Add {W}
 type=Basic Land
@@ -1157,7 +1189,7 @@ rarity=L
 [/card]
 [card]
 text={T}: Add {W} to your mana pool.
-id=3588 
+id=3588
 name=Plains
 auto={T}:Add {W}
 type=Basic Land
@@ -1168,19 +1200,19 @@ rarity=L
 text=Radiant Essence gets +1/+2 as long as an opponent controls a black permanent.
 id=3547
 name=Radiant Essence
-auto=aslongas(*[black]|opponentBattlefield) 1/2
 rarity=U
 mana={1}{G}{W}
 type=Creature
 subtype=Spirit
+auto=aslongas(*[black]|opponentBattlefield) 1/2
 power=2
 toughness=3
 [/card]
 [card]
 text=Search your library for a basic land card and put that card onto the battlefield tapped. Then shuffle your library.
+id=3404
 target=basic|mylibrary
 auto=moveTo(myBattlefield) && tap
-id=3404
 name=Rampant Growth
 rarity=C
 mana={1}{G}
@@ -1201,10 +1233,10 @@ type=Instant
 [/card]
 [card]
 text=Enchant creature   {G}: Regenerate enchanted creature. (The next time that creature would be destroyed this turn, it isn't. Instead tap it, remove all damage from it, and remove it from combat.)
-id=3405 
-name=Regeneration
+id=3405
 target=creature
 auto={G}:regenerate
+name=Regeneration
 rarity=C
 mana={1}{G}
 type=Enchantment
@@ -1212,7 +1244,7 @@ subtype=Aura
 [/card]
 [card]
 text={B}: Regenerate Restless Dead.
-id=3307 
+id=3307
 name=Restless Dead
 rarity=C
 mana={1}{B}
@@ -1236,7 +1268,7 @@ subtype=Aura
 [/card]
 [card]
 text=Whenever Rock Basilisk blocks or is blocked by a non-Wall creature, destroy that creature at end of combat.
-id=3550 
+id=3550
 alias=1238
 name=Rock Basilisk
 rarity=R
@@ -1248,10 +1280,10 @@ toughness=5
 [/card]
 [card]
 text=Rocky Tar Pit enters the battlefield tapped.   {T}, Sacrifice Rocky Tar Pit: Search your library for a Swamp or Mountain card and put it into play. Then shuffle your library.
-auto=tap
-auto={T}{S}:moveTo(myBattlefield) target(mountain,swamp|myLibrary)
 id=3575
 name=Rocky Tar Pit
+auto=tap
+auto={T}{S}:moveTo(myBattlefield) target(mountain,swamp|myLibrary)
 rarity=U
 type=Land
 [/card]
@@ -1285,7 +1317,7 @@ type=Sorcery
 [/card]
 [card]
 text={T}: Add {1} to your mana pool.   {1}{T}: Add {U} to your mana pool.
-id=3361 
+id=3361
 name=Sea Scryer
 rarity=C
 mana={1}{U}
@@ -1306,9 +1338,9 @@ type=Sorcery
 [/card]
 [card]
 text=Destroy all Auras.
-id=3411 
-name=Serene Heart
+id=3411
 auto=destroy all(aura)
+name=Serene Heart
 rarity=C
 mana={1}{G}
 type=Instant
@@ -1340,7 +1372,7 @@ toughness=1
 [/card]
 [card]
 text={W}{T}: Target creature gains first strike until end of turn.   {B}, {T}: Target creature gets +1/+0 until end of turn.
-id=3362 
+id=3362
 name=Shaper Guildmage
 rarity=C
 mana={U}
@@ -1368,7 +1400,7 @@ abilities=flying
 [/card]
 [card]
 text={B}{R}{T}: Shauku's Minion deals 2 damage to target white creature.
-id=3554 
+id=3554
 name=Shauku's Minion
 rarity=U
 mana={1}{B}{R}
@@ -1380,7 +1412,7 @@ toughness=2
 [/card]
 [card]
 text=Sky Diamond enters the battlefield tapped.   {T}: Add {U} to your mana pool.
-id=3267 
+id=3267
 name=Sky Diamond
 auto=tap
 auto={T}:Add {U}
@@ -1408,8 +1440,7 @@ rarity=R
 mana={6}{B}{B}{B}
 type=Legendary Creature
 subtype=Demon Spirit
-auto=@each my combatbegins:first strike
-auto=@each my combatends:-first strike
+auto=lord(spirit of the night[attacking]|myBattlefield) first strike
 power=6
 toughness=5
 abilities=flying,trample,haste,protection from black
@@ -1426,12 +1457,12 @@ type=Sorcery
 [/card]
 [card]
 text=Destroy target land.
-id=3465 
+id=3465
+target=land
+auto=destroy
 name=Stone Rain
 rarity=C
 mana={2}{R}
-target=land
-auto=destroy
 type=Sorcery
 [/card]
 [card]
@@ -1471,7 +1502,7 @@ rarity=L
 [/card]
 [card]
 text={T}: Add {B} to your mana pool.
-id=3563 
+id=3563
 name=Swamp
 auto={T}:Add {B}
 type=Basic Land
@@ -1480,7 +1511,7 @@ rarity=L
 [/card]
 [card]
 text={T}: Add {B} to your mana pool.
-id=3564 
+id=3564
 name=Swamp
 auto={T}:Add {B}
 type=Basic Land
@@ -1535,7 +1566,7 @@ text=Exile target permanent you own or control. Draw a card at the beginning of
 id=3469
 target=*|myBattlefield
 auto=moveTo(myexile)
-auto=@next upkeep:draw:1
+auto=@next upkeep:draw:1 controller
 name=Telim'Tor's Edict
 rarity=R
 mana={R}
diff --git a/projects/mtg/bin/Res/sets/MIR/todo.dat b/projects/mtg/bin/Res/sets/MIR/todo.dat
index 0100a5118..e47f532fa 100644
--- a/projects/mtg/bin/Res/sets/MIR/todo.dat
+++ b/projects/mtg/bin/Res/sets/MIR/todo.dat
@@ -187,17 +187,6 @@ type=Artifact
 mana={4}
 [/card]
 [card]
-text=Whenever Brushwagg blocks or becomes blocked, it gets -2/+2 until end of turn.
-id=3377
-name=Brushwagg
-rarity=R
-type=Creature
-mana={1}{G}{G}
-power=3
-subtype=Brushwagg
-toughness=2
-[/card]
-[card]
 text=Destroy X target artifacts. Builder's Bane deals damage to each player equal to the number of artifacts he or she controlled destroyed this way.
 id=3431
 name=Builder's Bane
@@ -639,17 +628,6 @@ subtype=Efreet
 toughness=1
 [/card]
 [card]
-text=Whenever Goblin Elite Infantry blocks or becomes blocked, it gets -1/-1 until end of turn.
-id=3448
-name=Goblin Elite Infantry
-rarity=C
-type=Creature
-mana={1}{R}
-power=2
-subtype=Goblin Warrior
-toughness=2
-[/card]
-[card]
 text={R}, {T}: Destroy target artifact. That artifact deals damage equal to its converted mana cost to Goblin Tinkerer.
 id=3451
 name=Goblin Tinkerer
diff --git a/projects/mtg/bin/Res/sets/MRQ/_cards.dat b/projects/mtg/bin/Res/sets/MRQ/_cards.dat
index e0f864a96..1f8443ec3 100644
--- a/projects/mtg/bin/Res/sets/MRQ/_cards.dat
+++ b/projects/mtg/bin/Res/sets/MRQ/_cards.dat
@@ -5,9 +5,9 @@ block=Masks
 [/meta]
 [card]
 text=Enchant creature   Enchanted creature gets +2/+2 for each other enchantment on the battlefield.
+id=19634
 target=creature
 auto=foreach(other enchantment|battlefield) 2/2
-id=19634
 name=Ancestral Mask
 rarity=C
 mana={2}{G}
@@ -154,9 +154,10 @@ type=Sorcery
 [/card]
 [card]
 text=Flash   Enchant creature   Enchanted creature has flying.
+id=19574
+
 target=creature
 auto=flying
-id=19574
 name=Buoyancy
 rarity=C
 mana={1}{U}
@@ -254,9 +255,9 @@ abilities=flying
 [/card]
 [card]
 text=Search your library for a Mercenary card, reveal that card, and put it into your hand. Then shuffle your library.
+id=19832
 target=mercenary|myLibrary
 auto=moveTo(myHand)
-id=19832
 name=Cateran Summons
 rarity=U
 mana={B}
@@ -264,10 +265,10 @@ type=Sorcery
 [/card]
 [card]
 text=Enchant creature   Enchanted creature gets +1/+1 and has mountainwalk.
+id=19620
 target=creature
 auto=1/1
 auto=mountainwalk
-id=19620
 name=Cave Sense
 rarity=C
 mana={1}{R}
@@ -331,9 +332,9 @@ type=Enchantment
 [/card]
 [card]
 text=Counter target spell.
+id=19570
 target=*|stack
 auto=fizzle
-id=19570
 name=Counterspell
 rarity=U
 mana={U}{U}
@@ -443,6 +444,19 @@ power=2
 toughness=1
 [/card]
 [card]
+text=Whenever Deepwood Wolverine becomes blocked, it gets +2/+0 until end of turn.
+id=19623
+name=Deepwood Wolverine
+rarity=C
+mana={G}
+type=Creature
+subtype=Wolverine
+auto=rampage(2/0,0)
+auto=rampage(-2/0,1)
+power=1
+toughness=1
+[/card]
+[card]
 text=Enchant creature (Target a creature as you cast this. This card enters the battlefield attached to that creature.)   Enchanted creature doesn't untap during its controller's untap step.
 id=19577
 target=creature
diff --git a/projects/mtg/bin/Res/sets/MRQ/todo.dat b/projects/mtg/bin/Res/sets/MRQ/todo.dat
index 055ea8174..6426f2c2d 100644
--- a/projects/mtg/bin/Res/sets/MRQ/todo.dat
+++ b/projects/mtg/bin/Res/sets/MRQ/todo.dat
@@ -440,18 +440,6 @@ power=2
 subtype=Beast
 toughness=4
 [/card]
-[card]
-text=Whenever Deepwood Wolverine becomes blocked, it gets +2/+0 until end of turn.
-id=19623
-name=Deepwood Wolverine
-rarity=C
-type=Creature
-mana={G}
-power=1
-subtype=Wolverine
-toughness=1
-[/card]
-
 [card]
 text=Trample     You may sacrifice three black creatures rather than pay Delraich's mana cost.
 id=19697
diff --git a/projects/mtg/bin/Res/sets/P02/_cards.dat b/projects/mtg/bin/Res/sets/P02/_cards.dat
index 3e258a2d8..f3f0bbaa0 100644
--- a/projects/mtg/bin/Res/sets/P02/_cards.dat
+++ b/projects/mtg/bin/Res/sets/P02/_cards.dat
@@ -1,4 +1,4 @@
-[meta]
+p[meta]
 author=Wagic Team
 year=1998
 block=Portal
@@ -766,6 +766,19 @@ power=1
 toughness=2
 [/card]
 [card]
+text=Whenever Norwood Warrior becomes blocked, it gets +1/+1 until end of turn.
+id=6620
+name=Norwood Warrior
+rarity=C
+mana={2}{G}
+type=Creature
+subtype=Elf Warrior
+auto=rampage(1/1,0)
+auto=rampage(-1/-1,1)
+power=2
+toughness=2
+[/card]
+[card]
 id=6599
 name=Obsidian Giant
 rarity=U
@@ -898,6 +911,19 @@ mana={B}
 type=Sorcery
 [/card]
 [card]
+text=Whenever Razorclaw Bear becomes blocked, it gets +2/+2 until end of turn.
+id=6638
+name=Razorclaw Bear
+rarity=R
+mana={2}{G}{G}
+type=Creature
+subtype=Bear
+auto=rampage(2/2,0)
+auto=rampage(-2/-2,1)
+power=3
+toughness=3
+[/card]
+[card]
 text=Cast Remove only during the declare attackers step and only if you've been attacked this step. Return target attacking creature to its owner's hand.
 id=6541
 target=creature[attacking]|opponentBattlefield
diff --git a/projects/mtg/bin/Res/sets/P02/todo.dat b/projects/mtg/bin/Res/sets/P02/todo.dat
index 4d32df6c4..679ec865f 100644
--- a/projects/mtg/bin/Res/sets/P02/todo.dat
+++ b/projects/mtg/bin/Res/sets/P02/todo.dat
@@ -179,17 +179,6 @@ text=Norwood Riders can't be blocked by more than one creature.
 rarity=C
 [/card]
 [card]
-id=6620
-name=Norwood Warrior
-mana={2}{G}
-type=Creature
-subtype=Elf Warrior
-power=2
-toughness=2
-text=Whenever Norwood Warrior becomes blocked, it gets +1/+1 until end of turn.
-rarity=C
-[/card]
-[card]
 id=6550
 name=Piracy
 mana={U}{U}
@@ -239,17 +228,6 @@ text=When Ravenous Rats enters the battlefield, target opponent discards a card.
 rarity=U
 [/card]
 [card]
-id=6638
-name=Razorclaw Bear
-mana={2}{G}{G}
-type=Creature
-subtype=Bear
-power=3
-toughness=3
-text=Whenever Razorclaw Bear becomes blocked, it gets +2/+2 until end of turn.
-rarity=R
-[/card]
-[card]
 id=6608
 name=Relentless Assault
 mana={2}{R}{R}
diff --git a/projects/mtg/bin/Res/sets/PTK/_cards.dat b/projects/mtg/bin/Res/sets/PTK/_cards.dat
index dd393d931..36e83827d 100644
--- a/projects/mtg/bin/Res/sets/PTK/_cards.dat
+++ b/projects/mtg/bin/Res/sets/PTK/_cards.dat
@@ -843,6 +843,19 @@ power=*
 toughness=4
 [/card]
 [card]
+text=Whenever Slashing Tiger becomes blocked, it gets +2/+2 until end of turn.
+id=10591
+name=Slashing Tiger
+rarity=R
+mana={2}{G}{G}
+type=Creature
+subtype=Cat
+auto=rampage(2/2,0)
+auto=rampage(-2/-2,1)
+power=3
+toughness=3
+[/card]
+[card]
 id=10545
 name=Southern Elephant
 rarity=C
@@ -1000,6 +1013,19 @@ mana={1}{G}
 type=Sorcery
 [/card]
 [card]
+text=Whenever Trained Cheetah becomes blocked, it gets +1/+1 until end of turn.
+id=10573
+name=Trained Cheetah
+rarity=U
+mana={2}{G}
+type=Creature
+subtype=Cat
+auto=rampage(1/1,0)
+auto=rampage(-1/-1,1)
+power=2
+toughness=2
+[/card]
+[card]
 id=10571
 name=Trained Jackal
 rarity=C
diff --git a/projects/mtg/bin/Res/sets/PTK/todo.dat b/projects/mtg/bin/Res/sets/PTK/todo.dat
index 1995bea41..5b3ddea79 100644
--- a/projects/mtg/bin/Res/sets/PTK/todo.dat
+++ b/projects/mtg/bin/Res/sets/PTK/todo.dat
@@ -269,17 +269,6 @@ text=Target creature gets +2/+2 and gains horsemanship. (It can't be blocked exc
 rarity=U
 [/card]
 [card]
-id=10591
-name=Slashing Tiger
-mana={2}{G}{G}
-type=Creature
-subtype=Cat
-power=3
-toughness=3
-text=Whenever Slashing Tiger becomes blocked, it gets +2/+2 until end of turn.
-rarity=R
-[/card]
-[card]
 id=10550
 name=Stalking Tiger
 mana={3}{G}
@@ -307,17 +296,6 @@ text=All creatures able to block target creature this turn do so.
 rarity=R
 [/card]
 [card]
-id=10573
-name=Trained Cheetah
-mana={2}{G}
-type=Creature
-subtype=Cat
-power=2
-toughness=2
-text=Whenever Trained Cheetah becomes blocked, it gets +1/+1 until end of turn.
-rarity=U
-[/card]
-[card]
 id=10552
 name=Warrior's Oath
 mana={R}{R}
diff --git a/projects/mtg/bin/Res/sets/SHM/_cards.dat b/projects/mtg/bin/Res/sets/SHM/_cards.dat
index 62b23bf12..b1be25c21 100644
--- a/projects/mtg/bin/Res/sets/SHM/_cards.dat
+++ b/projects/mtg/bin/Res/sets/SHM/_cards.dat
@@ -1289,6 +1289,22 @@ toughness=1
 abilities=wither
 [/card]
 [card]
+text=Wither (This deals damage to creatures in the form of -1/-1 counters.)   Whenever Slinking Giant blocks or becomes blocked, it gets -3/-0 until end of turn.
+id=153995
+name=Slinking Giant
+rarity=U
+mana={2}{R}{R}
+type=Creature
+subtype=Giant Rogue
+auto=rampage(-3/0,0)
+auto=rampage(3/0,1)
+auto=lord(slinking giant[blocking]|mybattlefield) -3/0
+auto=lord(other slinking giant[blocking]|mybattlefield) 3/0
+power=4
+toughness=4
+abilities=wither
+[/card]
+[card]
 text=When Somnomancer enters the battlefield, you may tap target creature.
 auto=may tap target(creature)
 id=147399
diff --git a/projects/mtg/bin/Res/sets/SHM/todo.dat b/projects/mtg/bin/Res/sets/SHM/todo.dat
index c52b7e655..c8dc2efe7 100644
--- a/projects/mtg/bin/Res/sets/SHM/todo.dat
+++ b/projects/mtg/bin/Res/sets/SHM/todo.dat
@@ -1218,17 +1218,6 @@ mana={2}{U}
 subtype=Aura
 [/card]
 [card]
-text=Wither (This deals damage to creatures in the form of -1/-1 counters.)  Whenever Slinking Giant blocks or becomes blocked, it gets -3/-0 until end of turn.
-id=153995
-name=Slinking Giant
-rarity=U
-type=Creature
-mana={2}{R}{R}
-power=4
-subtype=Giant Rogue
-toughness=4
-[/card]
-[card]
 text=Whenever a player plays a black spell, you may pay {1}. If you do, target player loses 1 life.
 id=147376
 name=Smolder Initiate
diff --git a/projects/mtg/bin/Res/sets/SOK/_cards.dat b/projects/mtg/bin/Res/sets/SOK/_cards.dat
index 901574a9e..199fff27e 100644
--- a/projects/mtg/bin/Res/sets/SOK/_cards.dat
+++ b/projects/mtg/bin/Res/sets/SOK/_cards.dat
@@ -51,6 +51,22 @@ power=2
 toughness=1
 [/card]
 [card]
+text=Flying   Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.)
+id=74050
+name=Araba Mothrider
+rarity=C
+mana={1}{W}
+type=Creature
+subtype=Human Samurai
+auto=rampage(1/1,0)
+auto=rampage(-1/-1,1)
+auto=lord(araba mothrider[blocking]|mybattlefield) 1/1
+auto=lord(other araba mothrider[blocking]|mybattlefield) -1/-1
+power=1
+toughness=1
+abilities=flying
+[/card]
+[card]
 text=Legendary landwalk
 id=84370
 name=Ayumi, the Last Visitor
@@ -236,6 +252,38 @@ toughness=1
 abilities=haste
 [/card]
 [card]
+text=Protection from white   Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.)
+id=74063
+name=Hand of Cruelty
+rarity=U
+mana={B}{B}
+type=Creature
+subtype=Human Samurai
+auto=rampage(1/1,0)
+auto=rampage(-1/-1,1)
+auto=lord(hand of cruelty[blocking]|mybattlefield) 1/1
+auto=lord(other hand of cruelty[blocking]|mybattlefield) -1/-1
+power=2
+toughness=2
+abilities=protection from white
+[/card]
+[card]
+text=Protection from black   Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.)
+id=74173
+name=Hand of Honor
+rarity=U
+mana={W}{W}
+type=Creature
+subtype=Human Samurai
+auto=rampage(1/1,0)
+auto=rampage(-1/-1,1)
+auto=lord(hand of honor[blocking]|mybattlefield) 1/1
+auto=lord(other hand of honor[blocking]|mybattlefield) -1/-1
+power=2
+toughness=2
+abilities=protection from black
+[/card]
+[card]
 text=When Haru-Onna enters the battlefield, draw a card.   Whenever you cast a Spirit or Arcane spell, you may return Haru-Onna to its owner's hand.
 id=74062
 name=Haru-Onna
@@ -249,6 +297,20 @@ power=2
 toughness=1
 [/card]
 [card]
+text=Bushido 2 (When this blocks or becomes blocked, it gets +2/+2 until end of turn.)   {2}{R}, Sacrifice a Samurai: Samurai creatures you control gain double strike until end of turn.
+id=79860
+name=Iizuka the Ruthless
+rarity=R
+mana={3}{R}{R}
+type=Legendary Creature
+subtype=Human Samurai
+auto=rampage(2/2,0)
+auto=rampage(-2/-2,1)
+auto=lord(iizuka the ruthless[blocking]|mybattlefield) 2/2
+power=3
+toughness=3
+[/card]
+[card]
 text=Target creature gets +X/+X until end of turn, where X is the number of cards in your hand.
 id=74049
 target=creature
@@ -260,6 +322,21 @@ type=Instant
 subtype=Arcane
 [/card]
 [card]
+text=Bushido 2 (When this blocks or becomes blocked, it gets +2/+2 until end of turn.)
+id=74002
+name=Inner-Chamber Guard
+rarity=U
+mana={1}{W}
+type=Creature
+subtype=Human Samurai
+auto=rampage(2/2,0)
+auto=rampage(-2/-2,1)
+auto=lord(inner-chamber guard[blocking]|mybattlefield) 2/2
+auto=lord(other inner-chamber guard[blocking]|mybattlefield) -2/-2
+power=0
+toughness=2
+[/card]
+[card]
 text=Add {R} to your mana pool for each card in your hand.
 id=84711
 auto=foreach(*|myhand) Add:{R}
@@ -351,6 +428,22 @@ toughness=2
 rarity=U
 [/card]
 [card]
+text=Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.)   When Kitsune Dawnblade enters the battlefield, you may tap target creature.
+id=80530
+name=Kitsune Dawnblade
+rarity=C
+mana={4}{W}
+type=Creature
+subtype=Fox Samurai
+auto=rampage(1/1,0)
+auto=rampage(-1/-1,1)
+auto=lord(araba mothrider[blocking]|mybattlefield) 1/1
+auto=lord(other araba mothrider[blocking]|mybattlefield) -1/-1
+auto=may tap target(creature)
+power=2
+toughness=3
+[/card]
+[card]
 text={1}{W}: Kitsune Loreweaver gets +0/+X until end of turn, where X is the number of cards in your hand.
 id=74213
 name=Kitsune Loreweaver
@@ -378,6 +471,22 @@ power=*
 toughness=*
 [/card]
 [card]
+text=Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.)   {1}{B}: Regenerate Kuro's Taken.
+id=74065
+name=Kuro's Taken
+rarity=C
+mana={1}{B}
+type=Creature
+subtype=Rat Samurai
+auto=rampage(1/1,0)
+auto=rampage(-1/-1,1)
+auto=lord(kuro's taken[blocking]|mybattlefield) 1/1
+auto=lord(other kuro's taken[blocking]|mybattlefield) -1/-1
+auto={1}{B}:regenerate
+power=1
+toughness=1
+[/card]
+[card]
 text=Masumaro, First to Live's power and toughness are each equal to twice the number of cards in your hand.
 id=74184
 name=Masumaro, First to Live
@@ -582,6 +691,21 @@ mana={2}{W}{W}
 type=Enchantment
 [/card]
 [card]
+text=Bushido 2 (When this blocks or becomes blocked, it gets +2/+2 until end of turn.)
+id=74199
+name=Ronin Cavekeeper
+rarity=C
+mana={5}{R}
+type=Creature
+subtype=Human Samurai
+auto=rampage(2/2,0)
+auto=rampage(-2/-2,1)
+auto=lord(ronin cavekeeper[blocking]|mybattlefield) 2/2
+auto=lord(other ronin cavekeeper[blocking]|mybattlefield) -2/-2
+power=4
+toughness=3
+[/card]
+[card]
 text={T}: You may put a land card from your hand onto the battlefield.
 id=74210
 name=Sakura-Tribe Scout
@@ -603,7 +727,7 @@ mana={2}
 type=Artifact
 [/card]
 [card]
-text=Shinen of Fear's Chill can't block.   Channel �E{1}{B}, Discard Shinen of Fear's Chill: Target creature can't block this turn.
+text=Shinen of Fear's Chill can't block.   Channel �- {1}{B}, Discard Shinen of Fear's Chill: Target creature can't block this turn.
 id=88812
 name=Shinen of Fear's Chill
 rarity=C
@@ -616,7 +740,7 @@ toughness=2
 abilities=cantblock
 [/card]
 [card]
-text=Flying   Channel �E{U}, Discard Shinen of Flight's Wings: Target creature gains flying until end of turn.
+text=Flying   Channel �- {U}, Discard Shinen of Flight's Wings: Target creature gains flying until end of turn.
 id=74088
 name=Shinen of Flight's Wings
 rarity=C
@@ -629,7 +753,7 @@ toughness=3
 abilities=flying
 [/card]
 [card]
-text=Haste   Channel �E{R}, Discard Shinen of Fury's Fire: Target creature gains haste until end of turn.
+text=Haste   Channel �- {R}, Discard Shinen of Fury's Fire: Target creature gains haste until end of turn.
 id=87339
 name=Shinen of Fury's Fire
 rarity=C
@@ -642,7 +766,7 @@ toughness=1
 abilities=haste
 [/card]
 [card]
-text=First strike   Channel �E{1}{W}, Discard Shinen of Stars' Light: Target creature gains first strike until end of turn.
+text=First strike   Channel �- {1}{W}, Discard Shinen of Stars' Light: Target creature gains first strike until end of turn.
 id=74361
 name=Shinen of Stars' Light
 rarity=C
@@ -668,6 +792,22 @@ power=3
 toughness=3
 [/card]
 [card]
+text=Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.)   {1}{R}: Sokenzan Spellblade gets +X/+0 until end of turn, where X is the number of cards in your hand.
+id=74398
+name=Sokenzan Spellblade
+rarity=C
+mana={4}{R}
+type=Creature
+subtype=Ogre Samurai Shaman
+auto=rampage(1/1,0)
+auto=rampage(-1/-1,1)
+auto=lord(sokenzan spellblade[blocking]|mybattlefield) 1/1
+auto=lord(other sokenzan spellblade[blocking]|mybattlefield) -1/-1
+auto={1}{R}:foreach(*|myhand) 1/0
+power=2
+toughness=3
+[/card]
+[card]
 text=Flying   Soramaro, First to Dream's power and toughness are each equal to the number of cards in your hand. {4}, Return a land you control to its owner's hand: Draw a card.
 id=74170
 name=Soramaro, First to Dream
diff --git a/projects/mtg/bin/Res/sets/SOK/todo.dat b/projects/mtg/bin/Res/sets/SOK/todo.dat
index 54e07032a..cc030e0d0 100644
--- a/projects/mtg/bin/Res/sets/SOK/todo.dat
+++ b/projects/mtg/bin/Res/sets/SOK/todo.dat
@@ -10,17 +10,6 @@ toughness=2
 rarity=R
 [/card]
 [card]
-text=Flying Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.)
-name=Araba Mothrider
-id=74050
-mana={1}{W}
-type=Creature
-subtype=Human Samurai
-power=1
-toughness=1
-rarity=C
-[/card]
-[card]
 text={X}{G}, {T}: Arashi, the Sky Asunder deals X damage to target creature with flying. Channel — {X}{G}{G}, Discard Arashi: Arashi deals X damage to each creature with flying.
 name=Arashi, the Sky Asunder
 id=87333
@@ -360,28 +349,6 @@ type=Instant
 rarity=U
 [/card]
 [card]
-text=Protection from white Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.)
-name=Hand of Cruelty
-id=74063
-mana={B}{B}
-type=Creature
-subtype=Human Samurai
-power=2
-toughness=2
-rarity=U
-[/card]
-[card]
-text=Protection from black Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.)
-name=Hand of Honor
-id=74173
-mana={W}{W}
-type=Creature
-subtype=Human Samurai
-power=2
-toughness=2
-rarity=U
-[/card]
-[card]
 text=If target player has exactly 10 life, Hidetsugu's Second Rite deals 10 damage to that player.
 name=Hidetsugu's Second Rite
 id=88818
@@ -424,17 +391,6 @@ subtype=Arcane
 rarity=C
 [/card]
 [card]
-text=Bushido 2 (When this blocks or becomes blocked, it gets +2/+2 until end of turn.) {2}{R}, Sacrifice a Samurai: Samurai creatures you control gain double strike until end of turn.
-name=Iizuka the Ruthless
-id=79860
-mana={3}{R}{R}
-type=Legendary Creature
-subtype=Human Samurai
-power=3
-toughness=3
-rarity=R
-[/card]
-[card]
 text=When Iname as One enters the battlefield, if you cast it from your hand, you may search your library for a Spirit permanent card, put it onto the battlefield, then shuffle your library. When Iname as One is put into a graveyard from the battlefield, you may exile it. If you do, return target Spirit permanent card from your graveyard to the battlefield.
 name=Iname as One
 id=74618
@@ -459,17 +415,6 @@ toughness=3
 rarity=R
 [/card]
 [card]
-text=Bushido 2 (When this blocks or becomes blocked, it gets +2/+2 until end of turn.)
-name=Inner-Chamber Guard
-id=74002
-mana={1}{W}
-type=Creature
-subtype=Human Samurai
-power=0
-toughness=2
-rarity=U
-[/card]
-[card]
 text=Target creature attacks this turn if able. Splice onto Arcane {R} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
 name=Into the Fray
 id=88813
@@ -557,17 +502,6 @@ toughness=1
 rarity=C
 [/card]
 [card]
-text=Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.) When Kitsune Dawnblade enters the battlefield, you may tap target creature.
-name=Kitsune Dawnblade
-id=80530
-mana={4}{W}
-type=Creature
-subtype=Fox Samurai
-power=2
-toughness=3
-rarity=C
-[/card]
-[card]
 text=At the beginning of the end step, if three or more creatures were put into graveyards from the battlefield this turn, flip Kuon, Ogre Ascendant.
 name=Kuon, Ogre Ascendant
 id=87596
@@ -587,17 +521,6 @@ type=Legendary Enchantment
 rarity=R
 [/card]
 [card]
-text=Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.) {1}{B}: Regenerate Kuro's Taken.
-name=Kuro's Taken
-id=74065
-mana={1}{B}
-type=Creature
-subtype=Rat Samurai
-power=1
-toughness=1
-rarity=C
-[/card]
-[card]
 text=Each opponent's maximum hand size is reduced by two.
 name=Locust Miser
 id=74394
@@ -818,17 +741,6 @@ subtype=Arcane
 rarity=C
 [/card]
 [card]
-text=Bushido 2 (When this blocks or becomes blocked, it gets +2/+2 until end of turn.)
-name=Ronin Cavekeeper
-id=74199
-mana={5}{R}
-type=Creature
-subtype=Human Samurai
-power=4
-toughness=3
-rarity=C
-[/card]
-[card]
 text=When you have 30 or more life, flip Rune-Tail, Kitsune Ascendant.
 name=Rune-Tail, Kitsune Ascendant
 id=87600
@@ -992,17 +904,6 @@ toughness=3
 rarity=U
 [/card]
 [card]
-text=Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.) {1}{R}: Sokenzan Spellblade gets +X/+0 until end of turn, where X is the number of cards in your hand.
-name=Sokenzan Spellblade
-id=74398
-mana={4}{R}
-type=Creature
-subtype=Ogre Samurai Shaman
-power=2
-toughness=3
-rarity=C
-[/card]
-[card]
 text=Put a 1/1 colorless Spirit creature token onto the battlefield. Splice onto Arcane {W} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
 name=Spiritual Visit
 id=74372
diff --git a/projects/mtg/bin/Res/sets/USG/_cards.dat b/projects/mtg/bin/Res/sets/USG/_cards.dat
index a020bfe13..34a7311b1 100644
--- a/projects/mtg/bin/Res/sets/USG/_cards.dat
+++ b/projects/mtg/bin/Res/sets/USG/_cards.dat
@@ -516,6 +516,21 @@ rarity=C
 type=Land
 [/card]
 [card]
+text=Whenever Dromosaur blocks or becomes blocked, it gets +2/-2 until end of turn.
+id=5734
+name=Dromosaur
+rarity=C
+mana={2}{R}
+type=Creature
+subtype=Lizard
+auto=rampage(2/-2,0)
+auto=rampage(-2/2,1)
+auto=lord(araba mothrider[blocking]|mybattlefield) 2/-2
+auto=lord(other araba mothrider[blocking]|mybattlefield) -2/2
+power=2
+toughness=3
+[/card]
+[card]
 text={B}{B}, {T}: Destroy target green creature. 
 id=5860
 name=Eastern Paladin
diff --git a/projects/mtg/bin/Res/sets/USG/todo.dat b/projects/mtg/bin/Res/sets/USG/todo.dat
index baf7596c2..003a41135 100644
--- a/projects/mtg/bin/Res/sets/USG/todo.dat
+++ b/projects/mtg/bin/Res/sets/USG/todo.dat
@@ -318,17 +318,6 @@ subtype=Djinn
 toughness=5
 [/card]
 [card]
-text=Whenever Dromosaur blocks or becomes blocked, it gets +2/-2 until end of turn.
-id=5734
-name=Dromosaur
-rarity=C
-type=Creature
-mana={2}{R}
-power=2
-subtype=Lizard
-toughness=3
-[/card]
-[card]
 text=Target opponent reveals his or her hand. You choose a noncreature, nonland card from it. That player discards that card.
 id=5557
 name=Duress
diff --git a/projects/mtg/bin/Res/sets/VIS/_cards.dat b/projects/mtg/bin/Res/sets/VIS/_cards.dat
index 0bb186e8a..dd8ae04cb 100644
--- a/projects/mtg/bin/Res/sets/VIS/_cards.dat
+++ b/projects/mtg/bin/Res/sets/VIS/_cards.dat
@@ -492,11 +492,26 @@ toughness=2
 [card]
 text={T}: Add 1 Mana to your mana pool.   {T}, Sacrifice Quicksand: Target attacking creature without flying gets -1/-2 until end of turn.
 id=3754
-name=Quicksand       
+name=Quicksand
+auto={T}:Add {1}
+auto={T}{S}:-1/-2 target(creature[attacking;-flying])   
 rarity=U
 type=Land
-auto={T}:Add {1}
-auto={T}{S}:-1/-2 target(creature[attacking;-flying])
+[/card]
+[card]
+text=Whenever Raging Gorilla blocks or becomes blocked, it gets +2/-2 until end of turn.
+id=3697
+name=Raging Gorilla
+rarity=C
+mana={2}{R}
+type=Creature
+subtype=Ape
+auto=rampage(2/-2,0)
+auto=rampage(-2/2,1)
+auto=lord(raging gorilla[blocking]|mybattlefield) 2/-2
+auto=lord(other raging gorilla[blocking]|mybattlefield) -2/2
+power=2
+toughness=3
 [/card]
 [card]
 text=Sacrifice Resistance Fighter: Prevent all combat damage target creature would deal this turn.
diff --git a/projects/mtg/bin/Res/sets/VIS/todo.dat b/projects/mtg/bin/Res/sets/VIS/todo.dat
index fa13816b2..3b410e6e6 100644
--- a/projects/mtg/bin/Res/sets/VIS/todo.dat
+++ b/projects/mtg/bin/Res/sets/VIS/todo.dat
@@ -590,17 +590,6 @@ text=Return a Forest you control to its owner's hand: Untap target creature. Act
 rarity=C
 [/card]
 [card]
-id=3697
-name=Raging Gorilla
-mana={2}{R}
-type=Creature
-subtype=Ape
-power=2
-toughness=3
-text=Whenever Raging Gorilla blocks or becomes blocked, it gets +2/-2 until end of turn.
-rarity=C
-[/card]
-[card]
 id=3648
 name=Rainbow Efreet
 mana={3}{U}