diff --git a/projects/mtg/bin/Res/sets/LRW/_cards.dat b/projects/mtg/bin/Res/sets/LRW/_cards.dat
index f19235e63..823033007 100644
--- a/projects/mtg/bin/Res/sets/LRW/_cards.dat
+++ b/projects/mtg/bin/Res/sets/LRW/_cards.dat
@@ -1,5 +1,5 @@
 [card]
-text=As Ancient Amphitheater comes into play, you may reveal a Giant card from your hand. If you don't, Ancient Amphitheater comes into play tapped.     {T}: Add {R} or {W} to your mana pool.
+text=As Ancient Amphitheater enters the battlefield, you may reveal a Giant card from your hand. If you don't, Ancient Amphitheater enters the battlefield tapped.   {T}: Add {R} or {W} to your mana pool.
 id=153454
 auto=tap
 auto=aslongas(giant|myHand) untap
@@ -10,7 +10,7 @@ rarity=R
 type=Land
 [/card]
 [card]
-text=As Auntie's Hovel comes into play, you may reveal a Goblin card from your hand. If you don't, Auntie's Hovel comes into play tapped.     {T}: Add {B} or {R} to your mana pool.
+text=As Auntie's Hovel enters the battlefield, you may reveal a Goblin card from your hand. If you don't, Auntie's Hovel enters the battlefield tapped.   {T}: Add {B} or {R} to your mana pool.
 id=153457
 auto=tap
 auto=aslongas(goblin|myHand) untap
@@ -24,34 +24,34 @@ type=Land
 id=145976
 name=Axegrinder Giant
 rarity=C
-type=Creature
 mana={4}{R}{R}
-power=6
+type=Creature
 subtype=Giant Warrior
+power=6
 toughness=4
 [/card]
 [card]
-text=Enchant creature     Enchanted creature has double strike.
+text=Enchant creature   Enchanted creature has double strike.
 target=creature
 auto=double strike
 id=145973
 name=Battle Mastery
 rarity=U
-type=Enchantment
 mana={2}{W}
+type=Enchantment
 subtype=Aura
 [/card]
 [card]
-text=Whenever a Forest comes into play under your control, Battlewand Oak gets +2/+2 until end of turn.     Whenever you play a Treefolk spell, Battlewand Oak gets +2/+2 until end of turn.
-auto=@movedTo(forest|myinplay): 2/2
-auto=@movedTo(treefolk|mystack): 2/2
+text=Whenever a Forest enters the battlefield under your control, Battlewand Oak gets +2/+2 until end of turn.     Whenever you cast a Treefolk spell, Battlewand Oak gets +2/+2 until end of turn.
+auto=@movedTo(forest|myBattlefield):2/2
+auto=@movedTo(treefolk|mystack):2/2
 id=141857
 name=Battlewand Oak
 rarity=C
-type=Creature
 mana={2}{G}
-power=1
+type=Creature
 subtype=Treefolk Warrior
+power=1
 toughness=3
 [/card]
 [card]
@@ -60,10 +60,10 @@ auto={2}{B}:regenerate target(treefolk)
 id=139454
 name=Black Poplar Shaman
 rarity=C
-type=Creature
 mana={2}{B}
-power=1
+type=Creature
 subtype=Treefolk Shaman
+power=1
 toughness=3
 [/card]
 [card]
@@ -71,13 +71,13 @@ text=Blind-Spot Giant can't attack or block unless you control another Giant.
 id=146597
 name=Blind-Spot Giant
 abilities=cantattack,cantblock
-auto=aslongas(Giant|myinplay) other -cantattack
-auto=aslongas(Giant|myinplay) other -cantblock
+auto=aslongas(other Giant|myBattlefield) -cantattack
+auto=aslongas(other Giant|myBattlefield) -cantblock
 rarity=C
-type=Creature
 mana={2}{R}
-power=4
+type=Creature
 subtype=Giant Warrior
+power=4
 toughness=3
 [/card]
 [card]
@@ -87,85 +87,84 @@ auto=moveTo(myHand)
 id=142359
 name=Boggart Birth Rite
 rarity=C
-type=Sorcery
-subtype=tribal
 mana={B}
-subtype=Goblin
+type=Sorcery
+subtype=Tribal Goblin
 [/card]
 [card]
-text=Forestwalk     {2}{B}, Sacrifice Boggart Loggers: Destroy target Treefolk or Forest.
-abilities=forestwalk
+text=Forestwalk   {2}{B}, Sacrifice Boggart Loggers: Destroy target Treefolk or Forest.
 auto={2}{B}{S}:destroy target(treefolk,forest)
 id=139709
 name=Boggart Loggers
 rarity=C
-type=Creature
 mana={2}{B}
-power=2
+type=Creature
 subtype=Goblin Rogue
+power=2
 toughness=1
+abilities=forestwalk
 [/card]
 [card]
-text=Whenever another Goblin you control is put into a graveyard from play, you may have Boggart Shenanigans deal 1 damage to target player.
+text=Whenever another Goblin you control is put into a graveyard the battlefield, you may have Boggart Shenanigans deal 1 damage to target player.
 id=139445
-auto=@movedTo(creature[goblin]|graveyard) from(myinplay):may damage:1 target(player)
+auto=@movedTo(other goblin|graveyard) from(myBattlefield):may damage:1 target(player)
 name=Boggart Shenanigans
 rarity=U
-type=Enchantment
 mana={2}{R}
+type=Enchantment
 subtype=Goblin
 [/card]
 [card]
 text=As long as you control a Faerie, Boggart Sprite-Chaser gets +1/+1 and has flying.
-auto=aslongas(faerie|myinplay) 1/1
-auto=aslongas(faerie|myinplay) flying
+auto=aslongas(faerie|myBattlefield) 1/1
+auto=aslongas(faerie|myBattlefield) flying
 id=146446
 name=Boggart Sprite-Chaser
 rarity=C
-type=Creature
 mana={1}{R}
-power=1
+type=Creature
 subtype=Goblin Warrior
+power=1
 toughness=2
 [/card]
 [card]
-text=First strike     {T}: Brigid, Hero of Kinsbaile deals 2 damage to each attacking or blocking creature target player controls.
+text=First strike   {T}: Brigid, Hero of Kinsbaile deals 2 damage to each attacking or blocking creature target player controls.
 id=141829
 name=Brigid, Hero of Kinsbaile
-abilities=legendary,first strike
-auto={T}:damage:2 all(creature[attacking;blocking]|opponentinplay)
-auto={T}:damage:2 all(creature[attacking;blocking]|myinplay)
+auto={T}:damage:2 all(creature[attacking;blocking]|opponentBattlefield)
+auto={T}:damage:2 all(creature[attacking;blocking]|myBattlefield)
 rarity=R
-type=Creature
 mana={2}{W}{W}
-power=2
+type=Creature
 subtype=Kithkin Archer
+power=2
 toughness=3
+abilities=legendary,first strike
 [/card]
 [card]
 text=Reach (This can block creatures with flying.)
-abilities=reach
 id=139492
 name=Cloudcrown Oak
 rarity=C
-type=Creature
 mana={2}{G}{G}
-power=3
+type=Creature
 subtype=Treefolk Warrior
+power=3
 toughness=4
+abilities=reach
 [/card]
 [card]
-text=Dauntless Dourbark's power and toughness are each equal to the number of Forests you control plus the number of Treefolk you control.     Dauntless Dourbark has trample as long as you control another Treefolk.
-auto=foreach(forest|myinplay) 1/1 
-auto=foreach(treefolk|myinplay) 1/1
-auto=aslongas(treefolk|myinplay) trample other
+text=Dauntless Dourbark's power and toughness are each equal to the number of Forests you control plus the number of Treefolk you control.   Dauntless Dourbark has trample as long as you control another Treefolk.
+auto=foreach(forest|myBattlefield) 1/1 
+auto=foreach(treefolk|myBattlefield) 1/1
+auto=aslongas(treefolk|myBattlefield) trample other
 id=141851
 name=Dauntless Dourbark
 rarity=R
-type=Creature
 mana={3}{G}
-power=*
+type=Creature
 subtype=Treefolk Warrior
+power=*
 toughness=*
 [/card]
 [card]
@@ -174,70 +173,70 @@ auto={U}:islandwalk
 id=142352
 name=Deeptread Merrow
 rarity=C
-type=Creature
 mana={1}{U}
-power=2
+type=Creature
 subtype=Merfolk Rogue
+power=2
 toughness=1
 [/card]
 [card]
 text=Sacrifice Elvish Eulogist: You gain 1 life for each Elf card in your graveyard.
-auto={s}:foreach(Elf|mygraveyard)life:1
+auto={S}:foreach(elf|mygraveyard) life:1
 id=141804
 name=Elvish Eulogist
 rarity=C
-type=Creature
 mana={G}
-power=1
+type=Creature
 subtype=Elf Shaman
+power=1
 toughness=1
 [/card]
 [card]
-text=Whenever a player plays a Giant spell, you may put a +1/+1 counter on Elvish Handservant.
+text=Whenever a player casts a Giant spell, you may put a +1/+1 counter on Elvish Handservant.
 auto=@movedTo(giant|stack):may counter(1/1)
 id=146179
 name=Elvish Handservant
 rarity=C
-type=Creature
 mana={G}
-power=1
+type=Creature
 subtype=Elf Warrior
+power=1
 toughness=1
 [/card]
 [card]
-text=Put a 1/1 green Elf Warrior creature token into play for each Elf you control.
+text=Put a 1/1 green Elf Warrior creature token onto the battlefield for each Elf you control.
 id=139676
 name=Elvish Promenade
-auto=foreach(elf|myinplay)token(Elf Warrior,creature Elf Warrior,1/1,green)
+auto=foreach(elf|myBattlefield) token(Elf Warrior,creature Elf Warrior,1/1,green)
 rarity=U
-type=Sorcery
 mana={3}{G}
+type=Sorcery
 subtype=Tribal Elf
 [/card]
 [card]
-text=Flash     Enchant creature     Enchanted creature gets +5/+5 and has trample.
-abilities=flash
+text=Flash   Enchant creature   Enchanted creature gets +5/+5 and has trample.
 target=creature
 auto=5/5
 auto=trample
 id=143732
 name=Epic Proportions
 rarity=R
-type=Enchantment
 mana={4}{G}{G}
+type=Enchantment
 subtype=Aura
+abilities=flash
 [/card]
 [card]
-text=Flying     Ethereal Whiskergill can't attack unless defending player controls an Island.
+text=Flying   Ethereal Whiskergill can't attack unless defending player controls an Island.
 id=139431
 name=Ethereal Whiskergill
 abilities=cantattack,flying
-auto=aslongas(Island|opponentinplay) -cantattack
+auto=aslongas(Island|opponentBattlefield) -cantattack
 rarity=U
-type=Creature
 mana={3}{U}
-power=4
+type=Creature
 subtype=Elemental
+power=4
 toughness=3
 [/card]
 [card]
@@ -247,21 +246,20 @@ auto=destroy
 id=139449
 name=Eyeblight's Ending
 rarity=C
-type=Instant
-subtype=tribal
 mana={2}{B}
-subtype=Elf
+type=Instant
+subtype=Tribal Elf
 [/card]
 [card]
 text={B}, Sacrifice a Goblin: Facevaulter gets +2/+2 until end of turn.
-auto={B}{S(goblin|myinplay)}:2/2
+auto={B}{S(goblin|myBattlefield)}:2/2
 id=142361
 name=Facevaulter
 rarity=C
-type=Creature
 mana={B}
-power=1
+type=Creature
 subtype=Goblin Warrior
+power=1
 toughness=1
 [/card]
 [card]
@@ -270,10 +268,10 @@ auto={R}:1/0
 id=139461
 name=Flamekin Brawler
 rarity=C
-type=Creature
 mana={R}
-power=0
+type=Creature
 subtype=Elemental Warrior
+power=0
 toughness=2
 [/card]
 [card]
@@ -282,20 +280,20 @@ auto={3}{R}:damage 1 target(creature,player)
 id=139728
 name=Flamekin Spitfire
 rarity=U
-type=Creature
 mana={1}{R}
-power=1
+type=Creature
 subtype=Elemental Shaman
+power=1
 toughness=1
 [/card]
 [card]
-text=Whenever an opponent plays a spell, that player draws seven cards.
-id=146166
+text=Whenever an opponent casts a spell, that player draws seven cards.
 auto=@movedTo(*[-land]|opponentstack):draw:7 opponent
+id=146166
 name=Forced Fruition
 rarity=R
-type=Enchantment
 mana={4}{U}{U}
+type=Enchantment
 [/card]
 [card]
 text={T}: Add {G} to your mana pool.
@@ -335,35 +333,36 @@ subtype=Forest
 [/card]
 [card]
 text=Giant's Ire deals 4 damage to target player. If you control a Giant, draw a card.
-auto=damage:4 target(player)
-auto=aslongas(creature[giant]|myinplay) draw:1 controller
+auto=damage:4 
+target=player
+auto=aslongas(giant|myBattlefield) draw:1 controller
 id=139477
 name=Giant's Ire
 rarity=C
-type=Sorcery
 mana={3}{R}
-subtype=Giant
+type=Sorcery
+subtype=Tribal Giant
 [/card]
 [card]
-text=As Gilt-Leaf Palace comes into play, you may reveal an Elf card from your hand. If you don't, Gilt-Leaf Palace comes into play tapped.     {T}: Add {B} or {G} to your mana pool.
+text=As Gilt-Leaf Palace enters the battlefield, you may reveal an Elf card from your hand. If you don't, Gilt-Leaf Palace comes into play tapped.     {T}: Add {B} or {G} to your mana pool.
 id=153455
 auto=tap
 auto=aslongas(elf|myHand) untap
-auto={T}:add{B}
-auto={T}:add{G}
+auto={T}:Add{B}
+auto={T}:Add{G}
 name=Gilt-Leaf Palace
 rarity=R
 type=Land
 [/card]
 [card]
-text=Enchant tapped creature     Enchanted creature doesn't untap during its controller's untap step.
+text=Enchant tapped creature   Enchanted creature doesn't untap during its controller's untap step.
 target=creature[tapped]
 auto=doesnotuntap
 id=139436
 name=Glimmerdust Nap
 rarity=C
-type=Enchantment
 mana={2}{U}
+type=Enchantment
 subtype=Aura
 [/card]
 [card]
@@ -372,35 +371,35 @@ auto={W}{T}:tap target(creature)
 id=139397
 name=Goldmeadow Harrier
 rarity=C
-type=Creature
 mana={W}
-power=1
+type=Creature
 subtype=Kithkin Soldier
+power=1
 toughness=1
 [/card]
 [card]
-text=When Guardian of Cloverdell comes into play, put three 1/1 white Kithkin Soldier creature tokens into play.     {G}, Sacrifice a Kithkin: You gain 1 life.
+text=When Guardian of Cloverdell enters the battlefield, put three 1/1 white Kithkin Soldier creature tokens onto the battlefield.   {G}, Sacrifice a Kithkin: You gain 1 life.
 auto=token(Kithkin Soldier,creature Kithkin Soldier,1/1,white)*3
-auto={G}{S(kithkin|myinplay)}:life: 1
+auto={G}{S(kithkin|myBattlefield)}:life: 1 controller
 id=139665
 name=Guardian of Cloverdell
 rarity=U
-type=Creature
 mana={5}{G}{G}
-power=4
+type=Creature
 subtype=Treefolk Shaman
+power=4
 toughness=5
 [/card]
 [card]
 text={W}, {T}: Harpoon Sniper deals X damage to target attacking or blocking creature, where X is the number of Merfolk you control.
-auto={W}{T}:foreach(merfolk|myinplay) damage:1 target(creature[attacking;blocking])
+auto={W}{T}:foreach(merfolk|myBattlefield) damage:1 target(creature[attacking;blocking])
 id=139407
 name=Harpoon Sniper
 rarity=U
-type=Creature
 mana={2}{W}
-power=2
+type=Creature
 subtype=Merfolk Archer
+power=2
 toughness=2
 [/card]
 [card]
@@ -411,20 +410,20 @@ target=creature
 auto=regenerate
 name=Heal the Scars
 rarity=C
-type=Instant
 mana={3}{G}
+type=Instant
 [/card]
 [card]
-text=When Hearthcage Giant comes into play, put two 3/1 red Elemental Shaman creature tokens into play.     Sacrifice an Elemental: Target Giant creature gets +3/+1 until end of turn.
+text=When Hearthcage Giant enters the battlefield, put two 3/1 red Elemental Shaman creature tokens onto the battlefield.   Sacrifice an Elemental: Target Giant creature gets +3/+1 until end of turn.
 auto=token(Elemental Shaman,creature Elemental Shaman,3/1,red)*2
-auto={S(elemental|myinplay)}:3/1
+auto={S(elemental|myBattlefield)}:3/1 target(creature[giant])
 id=139691
 name=Hearthcage Giant
 rarity=U
-type=Creature
 mana={6}{R}{R}
-power=5
+type=Creature
 subtype=Giant Warrior
+power=5
 toughness=5
 [/card]
 [card]
@@ -433,57 +432,57 @@ auto={3}{S}:regenerate target(creature)
 id=139740
 name=Herbal Poultice
 rarity=C
-type=Artifact
 mana={0}
+type=Artifact
 [/card]
 [card]
 text=Mountainwalk
-abilities=Mountainwalk
 id=145971
 name=Hillcomber Giant
 rarity=C
-type=Creature
 mana={2}{W}{W}
-power=3
+type=Creature
 subtype=Giant Scout
+power=3
 toughness=3
+abilities=mountainwalk
 [/card]
 [card]
-text=Vigilance, trample, haste     {W}{U}{B}{R}{G}: You may play target Elemental card from your graveyard without paying its mana cost.
-abilities=vigilance,trample,haste,Legendary 
-auto={W}{U}{B}{R}{G}:moveTo(myInPlay) target(elemental|mygraveyard)
+text=Vigilance, trample, haste   {W}{U}{B}{R}{G}: You may cast target Elemental card from your graveyard without paying its mana cost.
+auto={W}{U}{B}{R}{G}:moveTo(myBattlefield) target(elemental|mygraveyard)
 id=140219
 name=Horde of Notions
 rarity=R
-type=Creature
 mana={W}{U}{B}{R}{G}
-power=5
+type=Creature
 subtype=Elemental
+power=5
 toughness=5
+abilities=vigilance,trample,haste,legendary
 [/card]
 [card]
 text={T}: Put a +1/+1 counter on target creature for each Elf you control.
-auto={T}:foreach(elf|mybattlefield) counter(1/1) target(creature)
+auto={T}:foreach(elf|myBattlefield) counter(1/1) target(creature)
 id=139721
 name=Immaculate Magistrate
 rarity=R
-type=Creature
 mana={3}{G}
-power=2
+type=Creature
 subtype=Elf Shaman
+power=2
 toughness=2
 [/card]
 [card]
-text=Other Elf creatures you control get +1/+1.     {G}, {T}: Put a 1/1 green Elf Warrior creature token into play.
-auto=lord(elf|myinplay) 1/1 other 
+text=Other Elf creatures you control get +1/+1.   {G}, {T}: Put a 1/1 green Elf Warrior creature token onto the battlefield.
+auto=lord(elf|myBattlefield) 1/1 other 
 auto={G}{T}:token(Elf Warrior,creature Elf Warrior,1/1,green)
 id=139683
 name=Imperious Perfect
 rarity=U
-type=Creature
 mana={2}{G}
-power=2
+type=Creature
 subtype=Elf Warrior
+power=2
 toughness=2
 [/card]
 [card]
@@ -523,77 +522,65 @@ type=Basic Land
 subtype=Island
 [/card]
 [card]
-text=When Kinsbaile Skirmisher comes into play, target creature gets +1/+1 until end of turn.
-auto=1/1 target(creature)
-id=143018
-name=Kinsbaile Skirmisher
-rarity=C
-type=Creature
-mana={1}{W}
-power=2
-subtype=Kithkin Soldier
-toughness=2
-[/card]
-[card]
 text={G}, {T}: Target attacking creature gets +2/+2 until end of turn.
 auto={G}{T}:2/2 target(creature[attacking])
 id=139498
 name=Kithkin Daggerdare
 rarity=C
-type=Creature
 mana={1}{G}
-power=1
+type=Creature
 subtype=Kithkin Soldier
+power=1
 toughness=1
 [/card]
 [card]
 text=As long as you control a Giant, Kithkin Greatheart gets +1/+1 and has first strike.
-auto=aslongas(giant|myinplay) 1/1
-auto=aslongas(giant|myinplay) first strike
+auto=aslongas(giant|myBattlefield) 1/1
+auto=aslongas(giant|myBattlefield) first strike
 id=146444
 name=Kithkin Greatheart
 rarity=C
-type=Creature
 mana={1}{W}
-power=2
+type=Creature
 subtype=Kithkin Soldier
+power=2
 toughness=1
 [/card]
 [card]
-text=Whenever an attacking Kithkin or Elf is put into your graveyard from play, you may draw a card.
-auto=@movedTo(kithkin[attacking]|mygraveyard) from(inplay):may draw:1
-auto=@movedTo(elf[attacking]|mygraveyard) from(inplay):may draw:1
+text=Whenever an attacking Kithkin or Elf is put into your graveyard from the battlefield, you may draw a card.
+auto=@movedTo(kithkin[attacking]|mygraveyard) from(battlefield):may draw:1
+auto=@movedTo(elf[attacking]|mygraveyard) from(battlefield):may draw:1
 id=139497
 name=Kithkin Mourncaller
 rarity=U
-type=Creature
 mana={2}{G}
-power=2
+type=Creature
 subtype=Kithkin Scout
+power=2
 toughness=2
 [/card]
 [card]
 text=First strike   Lifelink (Whenever this creature deals damage, you gain that much life.)
-abilities=first strike,lifelink
 id=139715
 name=Knight of Meadowgrain
 rarity=U
-type=Creature
 mana={W}{W}
-power=2
+type=Creature
 subtype=Kithkin Knight
+power=2
 toughness=2
+abilities=first strike,lifelink
 [/card]
 [card]
-text=Whenever a Goblin you control is put into a graveyard from play, you may put a +1/+1 counter on Knucklebone Witch.
+text=Whenever a Goblin you control is put into a graveyard from the battlefield, you may put a +1/+1 counter on Knucklebone Witch.
 auto=@movedTo(goblin|graveyard) from(myBattlefield):may counter(1/1)
 id=143609
 name=Knucklebone Witch
 rarity=R
-type=Creature
 mana={B}
-power=1
+type=Creature
 subtype=Goblin Shaman
+power=1
 toughness=1
 [/card]
 [card]
@@ -609,40 +596,40 @@ subtype=Elf Druid
 toughness=1
 [/card]
 [card]
-text=Whenever you play an Elf spell, you may put a 1/1 green Elf Warrior creature token into play.
+text=Whenever you cast an Elf spell, you may put a 1/1 green Elf Warrior creature token onto the battlefield.
 auto=@movedTo(elf|mystack):may token(Elf Warrior,Creature Elf Warrior,1/1,green)
 id=139401
 name=Lys Alana Huntmaster
 rarity=C
-type=Creature
 mana={2}{G}{G}
+type=Creature
 power=3
 subtype=Elf Warrior
 toughness=3
 [/card]
 [card]
 text={T}, Discard an Elf card: Target creature gets -X/-X until end of turn, where X is the number of Elves you control.
-auto={T}{S(elf|myhand)}:foreach(elf|myinplay) -1/-1 target(creature)
+auto={T}{S(elf|myhand)}:foreach(elf|mybattlefield) -1/-1 target(creature)
 id=143021
 name=Lys Alana Scarblade
 rarity=U
-type=Creature
 mana={2}{B}
-power=1
+type=Creature
 subtype=Elf Assassin
+power=1
 toughness=1
 [/card]
 [card]
-text=Other Goblin creatures you control get +1/+1.     {T}: Regenerate another target Goblin.
-auto=lord(goblin|myinplay) 1/1 other
-auto={T}:regenerate target(goblin)
+text=Other Goblin creatures you control get +1/+1.   {T}: Regenerate another target Goblin.
+auto=lord(goblin|myBattlefield) 1/1 other
+auto={T}:regenerate target(other goblin)
 id=139708
 name=Mad Auntie
 rarity=R
-type=Creature
 mana={2}{B}
-power=2
+type=Creature
 subtype=Goblin Shaman
+power=2
 toughness=2
 [/card]
 [card]
@@ -651,8 +638,8 @@ auot={S}:damage:2 target(creature,player)
 id=139506
 name=Moonglove Extract
 rarity=C
-type=Artifact
 mana={3}
+type=Artifact
 [/card]
 [card]
 text={T}: Add {R} to your mana pool.
@@ -691,18 +678,18 @@ type=Basic Land
 subtype=Mountain
 [/card]
 [card]
-text=At the beginning of your upkeep, you may have target opponent discard a card at random.     Whenever an opponent discards a card, you may put a 1/1 green Elf Warrior creature token into play.
+text=At the beginning of your upkeep, you may have target opponent discard a card at random.   Whenever an opponent discards a card, you may put a 1/1 green Elf Warrior creature token onto the battlefield.
 id=143370
 auto=@each my upkeep:may discard:1 opponent
 auto=@movedTo(*|opponentgraveyard) from(opponenthand):may token(Elf Warrior,Creature Elf Warrior,1/1,green)
 name=Nath of the Gilt-Leaf
 rarity=R
-type=Creature
-abilities=Legendary
 mana={3}{B}{G}
-power=4
+type=Creature
 subtype=Elf Warrior
+power=4
 toughness=4
+abilities=legendary
 [/card]
 [card]
 text=Destroy target attacking or blocking creature.
@@ -711,57 +698,57 @@ auto=destroy
 id=139693
 name=Neck Snap
 rarity=C
-type=Instant
 mana={3}{W}
+type=Instant
 [/card]
 [card]
-text=Flying     {B}, {T}: Target Faerie or Elf gains lifelink until end of turn. (Whenever it deals damage, its controller gains that much life.)
-abilities=flying
+text=Flying   {B}, {T}: Target Faerie or Elf gains lifelink until end of turn. (Whenever it deals damage, its controller gains that much life.)
 auto={B}{T}:lifelink target(faerie,elf)
 id=139451
 name=Nectar Faerie
 rarity=U
-type=Creature
 mana={1}{B}
-power=1
+type=Creature
 subtype=Faerie Wizard
+power=1
 toughness=1
+abilities=flying
 [/card]
 [card]
-text=Flying     Nightshade Stinger can't block.
+text=Flying   Nightshade Stinger can't block.
 id=139456
 name=Nightshade Stinger
-abilities=flying,cantblock
 rarity=C
-type=Creature
 mana={B}
-power=1
+type=Creature
 subtype=Faerie Rogue
+power=1
 toughness=1
+abilities=flying,cantblock
 [/card]
 [card]
 text=Vigilance, trample
-abilities=vigilance,trample
 id=139494
 name=Oakgnarl Warrior
 rarity=C
-type=Creature
 mana={5}{G}{G}
-power=5
+type=Creature
 subtype=Treefolk Warrior
+power=5
 toughness=7
+abilities=vigilance,trample
 [/card]
 [card]
 text=Target creature gets -1/-1 until end of turn. If you control a Faerie, draw a card.
 target=creature
 auto=-1/-1
-auto=aslongas(faerie(creature)|myinplay) draw:1
+auto=aslongas(faerie|myBattlefield) draw:1
 id=139458
 name=Peppersmoke
 rarity=C
-type=Instant
 mana={B}
-subtype=Faerie
+type=Instant
+subtype=Tribal Faerie
 [/card]
 [card]
 text={T}: Add {W} to your mana pool.
@@ -801,120 +788,120 @@ subtype=Plains
 [/card]
 [card]
 text=Flying, first strike
-abilities=flying,first strike
 id=139396
 name=Plover Knights
 rarity=C
-type=Creature
 mana={3}{W}{W}
-power=3
+type=Creature
 subtype=Kithkin Knight
+power=3
 toughness=3
+abilities=flying,first strike
 [/card]
 [card]
-text=Whenever a player plays a Kithkin spell, you may have target player lose 1 life.
+text=Whenever a player casts a Kithkin spell, you may have target player lose 1 life.
 id=139469
 auto=@movedTo(kithkin|mystack):may life:-1 target(player)
 auto=@movedTo(kithkin|opponentstack):may life:-1 target(player)
 name=Quill-Slinger Boggart
 rarity=C
-type=Creature
 mana={3}{B}
-power=3
+type=Creature
 subtype=Goblin Warrior
+power=3
 toughness=2
 [/card]
 [card]
-text=Enchant creature     Enchanted creature is unblockable and has shroud. (It can't be the target of spells or abilities.)
+text=Enchant creature   Enchanted creature is unblockable and has shroud. (It can't be the target of spells or abilities.)
 target=creature
 auto=unblockable
 auto=shroud
 id=139687
 name=Protective Bubble
 rarity=C
-type=Enchantment
 mana={3}{U}
+type=Enchantment
 subtype=Aura
 [/card]
 [card]
-text=Whenever another nontoken Elf is put into your graveyard from play, you may put a 1/1 green Elf Warrior creature token into play.
+text=Whenever another nontoken Elf is put into your graveyard from the battlefield, you may put a 1/1 green Elf Warrior creature token onto the battlefield.
 auto=@movedTo(other elf|graveyard) from(battlefield):may token(Elf Warrior,creature elf warrior,1/1,green)
 id=146167
 name=Prowess of the Fair
 rarity=U
-type=Enchantment
 mana={1}{B}
-subtype=Elf
+type=Enchantment
+subtype=Tribal Elf
 [/card]
 [card]
 text=Destroy target noncreature permanent. If you control a Treefolk, draw a card.
 target=*[-creature]
 auto=destroy
-auto=aslongas(treefolk[creature]|myinplay) draw:1
+auto=aslongas(treefolk|myBattlefield) draw:1 controller
 id=139499
 name=Rootgrapple
 rarity=C
-type=Tribal Instant
 mana={4}{G}
-subtype=Treefolk
+type=Instant
+subtype=Tribal Treefolk
 [/card]
 [card]
 text={2}{B}, Remove an Elf card in your graveyard from the game: Scarred Vinebreeder gets +3/+3 until end of turn.
-auto={2}{B}:3/3 && moveTo(myremovedfromgame) target(elf|mygraveyard)
+auto={2}{B}:3/3 && moveTo(myExile) target(elf|mygraveyard)
 id=139674
 name=Scarred Vinebreeder
 rarity=C
-type=Creature
 mana={1}{B}
-power=1
+type=Creature
 subtype=Elf Shaman
+power=1
 toughness=1
 [/card]
 [card]
-text=Flash     Flying     Other Faerie creatures you control get +1/+1.     Other Faeries you control have shroud. (A permanent with shroud can't be the target of spells or abilities.)
-abilities=flash,flying
-auto=lord(faerie|myinplay) 1/1 other
-auto=lord(faerie|myinplay) shroud other
+text=Flash   Flying   Other Faerie creatures you control get +1/+1.   Other Faeries you control have shroud. (A permanent with shroud can't be the target of spells or abilities.)
+auto=lord(faerie|myBattlefield) 1/1 other
+auto=lord(faerie|myBattlefield) shroud other
 id=139741
 name=Scion of Oona
 rarity=R
-type=Creature
 mana={2}{U}
-power=1
+type=Creature
 subtype=Faerie Soldier
+power=1
 toughness=1
+abilities=flash,flying
 [/card]
 [card]
-text=As Secluded Glen comes into play, you may reveal a Faerie card from your hand. If you don't, Secluded Glen comes into play tapped.     {T}: Add {U} or {B} to your mana pool.
+text=As Secluded Glen enters the battlefield, you may reveal a Faerie card from your hand. If you don't, Secluded Glen enters the battlefield tapped.   {T}: Add {U} or {B} to your mana pool.
 id=153458
 auto=tap
 auto=aslongas(faerie|myHand) untap
-auto={T}:add{U}
-auto={T}:add{B}
+auto={T}:Add{U}
+auto={T}:Add{B}
 name=Secluded Glen
 rarity=R
 type=Land
 [/card]
 [card]
-text=Flash     Flying
-abilities=flash,flying
+text=Flash   Flying
 id=139426
 name=Sentinels of Glen Elendra
 rarity=C
-type=Creature
 mana={3}{U}
-power=2
+type=Creature
 subtype=Faerie Soldier
+power=2
 toughness=3
+abilities=flash,flying
 [/card]
 [card]
-text={T}: Add {1} to your mana pool.     {1}, {T}: Add one mana of any color to your mana pool.
+text={T}: Add {1} to your mana pool.   {1}, {T}: Add one mana of any color to your mana pool.
 auto={T}:Add {1}
-auto={1}{T}: Add {G}
-auto={1}{T}: Add {R}
-auto={1}{T}: Add {B}
-auto={1}{T}: Add {U}
-auto={1}{T}: Add {W}
+auto={1}{T}:Add {G}
+auto={1}{T}:Add {R}
+auto={1}{T}:Add {B}
+auto={1}{T}:Add {U}
+auto={1}{T}:Add {W}
 id=141802
 name=Shimmering Grotto
 rarity=C
@@ -922,53 +909,41 @@ type=Land
 [/card]
 [card]
 text={T}: Target creature gets -X/-0 until end of turn, where X is the number of Merfolk and/or Faeries you control.
-auto={T}:foreach(merfolk,faerie|myinplay) -1/0 target(creature)
+auto={T}:foreach(merfolk,faerie|myBattlefield) -1/0 target(creature)
 id=141853
 name=Silvergill Douser
 rarity=C
-type=Creature
 mana={1}{U}
-power=1
+type=Creature
 subtype=Merfolk Wizard
+power=1
 toughness=1
 [/card]
 [card]
-text=Enchant creature     When Soaring Hope comes into play, you gain 3 life.     Enchanted creature has flying.     {W}: Put Soaring Hope on top of its owner's library.
+text=Enchant creature   When Soaring Hope enters the battlefield, you gain 3 life.   Enchanted creature has flying.   {W}: Put Soaring Hope on top of its owner's library.
 target=creature
-auto=life:3
+auto=life:3 controller
 auto=flying
 auto={W}:moveTo(ownerlibrary)
 id=139511
 name=Soaring Hope
 rarity=C
-type=Enchantment
 mana={4}{W}
+type=Enchantment
 subtype=Aura
 [/card]
 [card]
-text=When Spiderwig Boggart comes into play, target creature gains fear until end of turn.
-auto=fear target(creature)
-id=146445
-name=Spiderwig Boggart
-rarity=C
-type=Creature
-mana={2}{B}
-power=2
-subtype=Goblin Shaman
-toughness=2
-[/card]
-[card]
 text={T}, Tap an untapped creature you control: Add one mana of any color to your mana pool.
-auto={T}:tap target(creature[-tapped]|myinplay) && Add{B}
-auto={T}:tap target(creature[-tapped]|myinplay) && Add{U}
-auto={T}:tap target(creature[-tapped]|myinplay) && Add{G}
-auto={T}:tap target(creature[-tapped]|myinplay) && Add{R}
-auto={T}:tap target(creature[-tapped]|myinplay) && Add{W}
+auto={T}:tap target(creature[-tapped]|myBattlefield) && Add{B}
+auto={T}:tap target(creature[-tapped]|myBattlefield) && Add{U}
+auto={T}:tap target(creature[-tapped]|myBattlefield) && Add{G}
+auto={T}:tap target(creature[-tapped]|myBattlefield) && Add{R}
+auto={T}:tap target(creature[-tapped]|myBattlefield) && Add{W}
 id=139509
 name=Springleaf Drum
 rarity=C
-type=Artifact
 mana={1}
+type=Artifact
 [/card]
 [card]
 text={1}{U}, {T}: You may tap or untap target creature.
@@ -977,35 +952,35 @@ auto={1}{U}{T}:untap target(creature)
 id=142358
 name=Stonybrook Angler
 rarity=C
-type=Creature
 mana={1}{U}
-power=1
+type=Creature
 subtype=Merfolk Wizard
+power=1
 toughness=2
 [/card]
 [card]
 text=Other Giant creatures you control get +2/+2 and have trample.
-auto=lord(giant|myinplay) 2/2 other
-auto=lord(giant|myinplay) trample other
+auto=lord(giant|myBattlefield) 2/2 other
+auto=lord(giant|myBattlefield) trample other
 id=139667
 name=Sunrise Sovereign
 rarity=R
-type=Creature
 mana={5}{R}
-power=5
+type=Creature
 subtype=Giant Warrior
+power=5
 toughness=5
 [/card]
 [card]
 text=Creatures you control get +1/+1 until end of turn. If you control a Kithkin, draw a card.
-auto=lord(creature|myinplay) 1/1
-auto=aslongas(kithkin[creature]|myinplay) draw:1
+auto=lord(creature|myBattlefield) 1/1
+auto=aslongas(kithkin|myBattlefield) draw:1 controller
 id=145799
 name=Surge of Thoughtweft
 rarity=C
-type=Instant
 mana={1}{W}
-subtype=Kithkin
+type=Instant
+subtype=Tribal Kithkin
 [/card]
 [card]
 text={T}: Add {B} to your mana pool.
@@ -1045,31 +1020,31 @@ subtype=Swamp
 [/card]
 [card]
 text=Islandwalk. {1}{W}: Target Merfolk you control gains protection from the color of your choice until end of turn.
-abilities=legendary,islandwalk
-auto={1}{W}:protection from black target(merfolk)
-auto={1}{W}:protection from blue target(merfolk)
-auto={1}{W}:protection from green target(merfolk)
-auto={1}{W}:protection from red target(merfolk)
-auto={1}{W}:protection from white target(merfolk)
+auto={1}{W}:protection from black target(merfolk|myBattlefield)
+auto={1}{W}:protection from blue target(merfolk|myBattlefield)
+auto={1}{W}:protection from green target(merfolk|myBattlefield)
+auto={1}{W}:protection from red target(merfolk|myBattlefield)
+auto={1}{W}:protection from white target(merfolk|myBattlefield)
 id=140172
 name=Sygg, River Guide
 rarity=R
-type=Creature
 mana={W}{U}
-power=2
+type=Creature
 subtype=Merfolk Wizard
+power=2
 toughness=2
+abilities=legendary,islandwalk
 [/card]
 [card]
 text={T}, Sacrifice a Goblin: Tar Pitcher deals 2 damage to target creature or player.
-auto={T},{S(goblin|myinplay)}:damage:2 target(creature,player)
+auto={T}{S(goblin|myBattlefield)}:damage:2 target(creature,player)
 id=139470
 name=Tar Pitcher
 rarity=U
-type=Creature
 mana={3}{R}
-power=2
+type=Creature
 subtype=Goblin Shaman
+power=2
 toughness=2
 [/card]
 [card]
@@ -1079,38 +1054,37 @@ auto=damage:2
 id=139476
 name=Tarfire
 rarity=C
-type=Instant
 mana={R}
-subtype=Goblin Tribal
+type=Instant
+subtype=Tribal Goblin
 [/card]
 [card]
-text=When Thundercloud Shaman comes into play, it deals damage equal to the number of Giants you control to each non-Giant creature.
+text=When Thundercloud Shaman enters the battlefield, it deals damage equal to the number of Giants you control to each non-Giant creature.
 id=139738
-auto=foreach(giant|myinplay) damage:1 all(creature[-giant])
+auto=foreach(giant|myBattlefield) damage:1 all(creature[-giant])
 name=Thundercloud Shaman
 rarity=U
-type=Creature
 mana={3}{R}{R}
-power=4
+type=Creature
 subtype=Giant Shaman
+power=4
 toughness=4
 [/card]
 [card]
-text=Other Treefolk creatures you control get +1/+1.     Other Treefolk and Forests you control are indestructible.
+text=Other Treefolk creatures you control get +1/+1.   Other Treefolk and Forests you control are indestructible.
 id=139690
-auto=lord(treefolk|myinplay) 1/1 other
-auto=lord(treefolk,forest|myinplay) indestructible other
+auto=lord(treefolk|myBattlefield) 1/1 other
+auto=lord(treefolk,forest|myBattlefield) indestructible other
 name=Timber Protector
 rarity=R
-type=Creature
 mana={4}{G}
-power=4
+type=Creature
 subtype=Treefolk Warrior
+power=4
 toughness=6
 [/card]
 [card]
-text=Flash     Enchant creature     When Triclopean Sight comes into play, untap enchanted creature.     Enchanted creature gets +1/+1 and has vigilance.
-abilities=flash
+text=Flash   Enchant creature   When Triclopean Sight enters the battlefield, untap enchanted creature.   Enchanted creature gets +1/+1 and has vigilance.
 target=creature
 auto=untap
 auto=1/1
@@ -1118,9 +1092,10 @@ auto=vigilance
 id=146580
 name=Triclopean Sight
 rarity=C
-type=Enchantment
 mana={1}{W}
+type=Enchantment
 subtype=Aura
+abilities=flash
 [/card]
 [card]
 text={1}, Sacrifice Wanderer's Twig: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.
@@ -1128,67 +1103,67 @@ auto={1}{S}:moveTo(myhand) target(land[basic]|mylibrary)
 id=139510
 name=Wanderer's Twig
 rarity=C
-type=Artifact
 mana={1}
+type=Artifact
 [/card]
 [card]
-text=As Wanderwine Hub comes into play, you may reveal a Merfolk card from your hand. If you don't, Wanderwine Hub comes into play tapped.     {T}: Add {W} or {U} to your mana pool.
+text=As Wanderwine Hub enters the battlefield, you may reveal a Merfolk card from your hand. If you don't, Wanderwine Hub comes into play tapped.     {T}: Add {W} or {U} to your mana pool.
 id=153456
 auto=tap
 auto=aslongas(merfolk|myHand) untap
-auto={T}:add{W}
-auto={T}:add{U}
+auto={T}:Add {W}
+auto={T}:Add {U}
 name=Wanderwine Hub
 rarity=R
 type=Land
 [/card]
 [card]
 text=Other Kithkin creatures you control get +1/+1.
-auto=lord(kithkin|myinplay) 1/1 other 
+auto=lord(kithkin|myBattlefield) 1/1 other 
 id=139716
 name=Wizened Cenn
 rarity=U
-type=Creature
 mana={W}{W}
-power=2
+type=Creature
 subtype=Kithkin Cleric
+power=2
 toughness=2
 [/card]
 [card]
-text=Fear     At the beginning of your upkeep, you may return target Goblin card from your graveyard to your hand.
-id=140226
+text=Fear   At the beginning of your upkeep, you may return target Goblin card from your graveyard to your hand.
 auto=@each my upkeep:may moveto(myhand) target(goblin|mygraveyard)
+id=140226
 name=Wort, Boggart Auntie
 rarity=R
-type=Creature
-abilities=Legendary
 mana={2}{B}{R}
-power=3
+type=Creature
 subtype=Goblin Shaman
+power=3
 toughness=3
+abilities=fear,legendary
 [/card]
 [card]
-text=Flash,Flying. {U}{B}, Pay 1 life: Return Wydwen, the Biting Gale to its owner's hand.
+text=Flash,flying.   {U}{B}, Pay 1 life: Return Wydwen, the Biting Gale to its owner's hand.
+auto={U}{B}:moveTo(ownerhand) && life:-1 controller
 id=140229
 name=Wydwen, the Biting Gale
 rarity=R
-type=Creature
-abilities=legendary,flying,flash
-auto={U}{B}:moveTo(ownerhand) && life:-1
 mana={2}{U}{B}
-power=3
+type=Creature
 subtype=Faerie Wizard
+power=3
 toughness=3
+abilities=legendary,flying,flash
 [/card]
 [card]
-text=Enchant creature     Enchanted creature has defender and flying.
+text=Enchant creature   Enchanted creature has defender and flying.
 target=creature
 auto=flying
 auto=defender
 id=142357
 name=Zephyr Net
 rarity=C
-type=Enchantment
 mana={1}{U}
+type=Enchantment
 subtype=Aura
 [/card]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/sets/LRW/todo.dat b/projects/mtg/bin/Res/sets/LRW/todo.dat
index 4a1fcf474..b325a5899 100644
--- a/projects/mtg/bin/Res/sets/LRW/todo.dat
+++ b/projects/mtg/bin/Res/sets/LRW/todo.dat
@@ -1050,7 +1050,19 @@ power=2
 subtype=Kithkin Cleric
 toughness=2
 [/card]
-
+[card]
+###THIS CARD IS NOT ABLE TO GIVE +1/+1 TO ITSELF WHEN ENTERING THE BATTLEFIELD FOR NOW! (WAGIC 0.8.1)
+text=When Kinsbaile Skirmisher enters the battlefield, target creature gets +1/+1 until end of turn.
+auto=1/1 target(creature)
+id=143018
+name=Kinsbaile Skirmisher
+rarity=C
+type=Creature
+mana={1}{W}
+power=2
+subtype=Kithkin Soldier
+toughness=2
+[/card]
 [card]
 text=Target creature gains deathtouch until end of turn. (Whenever it deals damage to a creature, destroy that creature.)  Draw a card.
 id=143376
@@ -1598,6 +1610,19 @@ subtype=Faerie Wizard
 toughness=1
 [/card]
 [card]
+###SEE KITHKIN SKIRMISHER!!!
+text=When Spiderwig Boggart enters the battlefield, target creature gains fear until end of turn.
+auto=fear target(creature)
+id=146445
+name=Spiderwig Boggart
+rarity=C
+type=Creature
+mana={2}{B}
+power=2
+subtype=Goblin Shaman
+toughness=2
+[/card]
+[card]
 text=Hideaway (This land comes into play tapped. When it does, look at the top four cards of your library, remove one from the game face down, then put the rest on the bottom of your library.)  {T}: Add {R} to your mana pool.     {R}, {T}: You may play the removed card without paying its mana cost if an opponent was dealt 7 or more damage this turn.
 id=139514
 name=Spinerock Knoll