diff --git a/projects/mtg/bin/Res/sets/10E/todo.dat b/projects/mtg/bin/Res/sets/10E/todo.dat
index de8ef7a88..8abf6a656 100644
--- a/projects/mtg/bin/Res/sets/10E/todo.dat
+++ b/projects/mtg/bin/Res/sets/10E/todo.dat
@@ -546,6 +546,9 @@ rarity=C
 color=Green
 type=Creature
 mana={2}{G}
+kicker={1}{G}
+#does not work in WTH 0.8.1
+auto=kicker moveto(mybattlefield) target(Llanowar Sentinel|mylibrary)
 power=2
 subtype=Elf
 toughness=3
@@ -595,8 +598,9 @@ subtype=Aura
 text=Whenever a player taps a land for mana, Manabarbs deals 1 damage to that player.
 id=130367
 name=Manabarbs
-auto=foreach(land[tapped]|myinplay)damage:1 controller
-auto=foreach(land[tapped]|opponentinplay)damage:1 opponent
+#will also deal damage if land not tapped for mana
+auto=@tapped(land|opponentBattlefield):damage:1 opponent
+auto=@tapped(land|myBattlefield):damage:1 controller
 rarity=R
 color=Red
 type=Enchantment
@@ -828,6 +832,7 @@ toughness=5
 text=Artifacts and lands come into play tapped.
 id=135251
 name=Root Maze
+auto=lord(artifact,land) tap
 rarity=R
 color=Green
 type=Enchantment
@@ -926,7 +931,7 @@ mana={1}{R}{R}
 [card]
 text=Draw three cards, then discard a card.
 id=136217
-auto=draw:3 && moveto(graveyard) target(*|myhand)
+auto=draw:3 && moveto(mygraveyard) target(*|myhand)
 name=Sift
 rarity=C
 color=Blue
@@ -992,7 +997,6 @@ id=135264
 name=Stampeding Wildebeests
 auto=@my upkeep:moveto(myhand) target(creature[green]|myBattlefield)
 rarity=U
-color=Green
 type=Creature
 mana={2}{G}{G}
 power=5
@@ -1027,7 +1031,6 @@ name=Sunken Hope
 auto=@each my upkeep:moveto(ownerHand) target(creature|myinplay)
 auto=@each opponent upkeep:moveto(ownerHand) target(creature|Opponentinplay)
 rarity=R
-color=Blue
 type=Enchantment
 mana={3}{U}{U}
 [/card]
@@ -1195,12 +1198,12 @@ text=Equipped creature is unblockable and has shroud. (It can't be the target of
 id=135278
 name=Whispersilk Cloak
 rarity=U
-color=Artifact
 type=Artifact
 mana={3}
 subtype=Equipment
 [/card]
 [card]
+#Technically correct could be added to the card.dat but this card is too powerfull the AI does not understand and simply never attack... in WTH 0.8.1
 text=Flying (This creature can't be blocked except by creatures with flying or reach.)  Creatures can't attack you unless their controller pays {2} for each creature he or she controls that's attacking you.
 id=130549
 name=Windborn Muse
@@ -1208,7 +1211,6 @@ auto=lord(creature|opponentinplay) cantattack
 auto=lord(creature|opponentinplay) {2}:-cantattack
 rarity=R
 abilities=flying
-color=White
 type=Creature
 mana={3}{W}
 power=2
diff --git a/projects/mtg/bin/Res/sets/RAV/_cards.dat b/projects/mtg/bin/Res/sets/RAV/_cards.dat
index 2d0759e7a..f30f89d91 100644
--- a/projects/mtg/bin/Res/sets/RAV/_cards.dat
+++ b/projects/mtg/bin/Res/sets/RAV/_cards.dat
@@ -610,7 +610,7 @@ name=Oathsworn Giant
 rarity=U
 mana={4}{W}{W}
 type=Creature
-subtype=Griffin
+subtype=Giant Soldier
 auto=lord(creature|myinplay) 0/2 other
 auto=lord(creature|myinplay) vigilance other
 power=3
diff --git a/projects/mtg/bin/Res/sets/RAV/todo.dat b/projects/mtg/bin/Res/sets/RAV/todo.dat
index 9ff5d7fe1..92f1d492b 100644
--- a/projects/mtg/bin/Res/sets/RAV/todo.dat
+++ b/projects/mtg/bin/Res/sets/RAV/todo.dat
@@ -1,11 +1,13 @@
 [card]
+#Since it is a legendary creature should work fine... did not test it yet
 text=Whenever Agrus Kos, Wojek Veteran attacks, attacking red creatures get +2/+0 and attacking white creatures get +0/+2 until end of turn.
 id=89101
-auto=aslongas(Agrus Kos[attacking]) lord(creature[red;attacking]) 2/0
-auto=aslongas(Agrus Kos[attacking]) lord(creature[white;attacking]) 0/2
+auto=aslongas(Agrus Kos[attacking]|myinplay) lord(creature[red;attacking]) 2/0
+auto=aslongas(Agrus Kos[attacking]|myinplay) lord(creature[white;attacking]) 0/2
 name=Agrus Kos, Wojek Veteran
 rarity=R
-type=Legendary Creature
+type=Creature
+abilities=legendary
 mana={3}{R}{W}
 power=3
 subtype=Human Soldier
diff --git a/projects/mtg/bin/Res/sets/STH/_cards.dat b/projects/mtg/bin/Res/sets/STH/_cards.dat
index 6f12ba93d..e30564173 100644
--- a/projects/mtg/bin/Res/sets/STH/_cards.dat
+++ b/projects/mtg/bin/Res/sets/STH/_cards.dat
@@ -286,8 +286,8 @@ color=Artifact
 rarity=R
 mana={3}
 type=Artifact
-auto=@movedTo(land|myBattlefield) from(myhand):draw:1 controller
-auto=@movedTo(land|opponentBattlefield) from(opponenthand):draw:1 opponent
+auto=@movedTo(land|myBattlefield):draw:1 controller
+auto=@movedTo(land|opponentBattlefield):draw:1 opponent
 [/card]
 [card]
 text=Creatures don't untap during their controllers' untap steps.   Whenever a creature enters the battlefield, untap all creatures.
diff --git a/projects/mtg/bin/Res/sets/TMP/_cards.dat b/projects/mtg/bin/Res/sets/TMP/_cards.dat
index e2e697084..91fbe1987 100644
--- a/projects/mtg/bin/Res/sets/TMP/_cards.dat
+++ b/projects/mtg/bin/Res/sets/TMP/_cards.dat
@@ -467,6 +467,16 @@ toughness=2
 abilities=legendary
 [/card]
 [card]
+text=At the beginning of each player's precombat main phase, add {G}{G} to that player's mana pool.
+id=4758
+name=Eladamri's Vineyard
+auto=@each my combatbegins:add:{G}{G}
+auto=@each opponent combatbegins:add:{G}{G} opponent
+rarity=R
+type=Enchantment
+mana={G}
+[/card]
+[card]
 text={2}, {T}: Put a +1/+1 counter on Energizer.
 auto={2}{T}:counter(1/1)
 id=4605
diff --git a/projects/mtg/bin/Res/sets/TMP/todo.dat b/projects/mtg/bin/Res/sets/TMP/todo.dat
index fa2e37e7b..adaf2cc89 100644
--- a/projects/mtg/bin/Res/sets/TMP/todo.dat
+++ b/projects/mtg/bin/Res/sets/TMP/todo.dat
@@ -54,6 +54,7 @@ toughness=4
 [/card]
 [card]
 text=Flying     When Avenging Angel is put into a graveyard from play, you may put Avenging Angel on top of its owner's library.
+auto=@movedTo(this|graveyard) from(inplay):may moveto(ownerlibrary)
 id=4863
 name=Avenging Angel
 rarity=R
@@ -354,14 +355,6 @@ type=Artifact
 mana={4}
 [/card]
 [card]
-text=At the beginning of each player's precombat main phase, add {G}{G} to that player's mana pool.
-id=4758
-name=Eladamri's Vineyard
-rarity=R
-type=Enchantment
-mana={G}
-[/card]
-[card]
 text=Whenever Elite Javelineer blocks, it deals 1 damage to target attacking creature.
 id=4873
 name=Elite Javelineer
@@ -867,7 +860,6 @@ rarity=U
 type=Artifact
 mana={2}
 [/card]
-
 [card]
 text={T}: Add {1} to your mana pool.     {T}: Add {R} or {G} to your mana pool. Mogg Hollows doesn't untap during your next untap step.
 id=4934
@@ -877,7 +869,8 @@ type=Land
 [/card]
 [card]
 text=When Mongrel Pack is put into a graveyard from play during combat, put four 1/1 green Hound creature tokens into play.
-auto=@movedTo(this|graveyard):token(Hound,Creature Hound,1/1,green)*4
+# does not work in WTH 0.8.1
+auto=@movedTo(this[attacking]|graveyard) from(inplay):token(Hound,Creature Hound,1/1,green)*4
 id=4771
 name=Mongrel Pack
 rarity=R
@@ -1002,6 +995,8 @@ mana={4}{U}
 [card]
 text=Creatures can't attack you unless their controller pays {2} for each creature he or she controls that's attacking you.
 id=4718
+auto=lord(creature|opponentBattlefield) cantattack
+auto=lord(creature|opponentBattlefield) {2}:-cantattack
 name=Propaganda
 rarity=U
 type=Enchantment
@@ -1078,6 +1073,7 @@ type=Land
 text=First strike     Whenever Renegade Warlord attacks, each other attacking creature gets +1/+0 until end of turn.
 id=4839
 name=Renegade Warlord
+auto=aslongas(this[attacking]|myBattlefield):lord(creature[attacking]) 1/0 other
 rarity=U
 type=Creature
 mana={4}{R}
@@ -1112,6 +1108,7 @@ mana={X}{R}{R}
 [card]
 text=Artifacts and lands come into play tapped.
 id=4784
+auto=lord(artifact,land)tap
 name=Root Maze
 rarity=R
 type=Enchantment
@@ -1320,6 +1317,8 @@ toughness=2
 [card]
 text=Shadow (This creature can block or be blocked by only creatures with shadow.)  Soltari Lancer has first strike as long as it's attacking.
 id=4902
+auto=aslongas(this[attacking]|myinplay) first strike
+abilities=shadow
 name=Soltari Lancer
 rarity=C
 type=Creature
@@ -1331,6 +1330,8 @@ toughness=2
 [card]
 text=Shadow (This creature can block or be blocked by only creatures with shadow.)  Whenever Soltari Trooper attacks, it gets +1/+1 until end of turn.
 id=4905
+auto=aslongas(this[attacking]|myinplay) 1/1
+abilities=shadow
 name=Soltari Trooper
 rarity=C
 type=Creature
diff --git a/projects/mtg/bin/Res/sets/TSP/_cards.dat b/projects/mtg/bin/Res/sets/TSP/_cards.dat
index ce0a82424..e636719c5 100644
--- a/projects/mtg/bin/Res/sets/TSP/_cards.dat
+++ b/projects/mtg/bin/Res/sets/TSP/_cards.dat
@@ -129,6 +129,20 @@ auto=fizzle
 rarity=C
 [/card]
 [card]
+id=118891
+name=Chromatic Star
+mana={1}
+type=Artifact
+text={1}, {T}, Sacrifice Chromatic Star: Add one mana of any color to your mana pool. When Chromatic Star is put into a graveyard from play, draw a card.
+auto={1}{T}{S}:add{B}
+auto={1}{T}{S}:add{U}
+auto={1}{T}{S}:add{G}
+auto={1}{T}{S}:add{R}
+auto={1}{T}{S}:add{W}
+auto=@movedTo(this|graveyard) from(inplay):draw:1 controller
+rarity=U
+[/card]
+[card]
 id=108858
 name=Dream Stalker
 mana={1}{U}
@@ -531,6 +545,18 @@ subtype=Treefolk
 toughness=5
 [/card]
 [card]
+id=122387
+name=Screeching Sliver
+mana={U}
+type=Creature
+subtype=Sliver
+power=1
+toughness=1
+text=All Slivers have "{T}: Target player puts the top card of his or her library into his or her graveyard."
+auto=lord(sliver) {T}:deplete:1 target(player)
+rarity=C
+[/card]
+[card]
 id=118917
 name=Sedge Sliver
 mana={2}{R}
@@ -785,6 +811,18 @@ subtype=Sliver
 toughness=3
 [/card]
 [card]
+id=109766
+name=Verdant Embrace
+mana={3}{G}{G}
+type=Enchantment
+subtype=Aura
+text=Enchant creature Enchanted creature gets +3/+3 and has "At the beginning of each upkeep, put a 1/1 green Saproling creature token into play under your control."
+target=creature
+auto=3/3
+auto=@each upkeep:token(Saproling,Creature Saproling,1/1,green)
+rarity=R
+[/card]
+[card]
 id=111069
 name=Viashino Bladescout
 mana={1}{R}{R}
diff --git a/projects/mtg/bin/Res/sets/TSP/todo.dat b/projects/mtg/bin/Res/sets/TSP/todo.dat
index a478ae0c4..cd849beba 100644
--- a/projects/mtg/bin/Res/sets/TSP/todo.dat
+++ b/projects/mtg/bin/Res/sets/TSP/todo.dat
@@ -1,4 +1,4 @@
-[card]
+[card]
 id=113619
 name=Amrou Scout
 mana={1}{W}
@@ -217,20 +217,6 @@ text=Sacrifice Children of Korlis: You gain life equal to the life you've lost t
 rarity=C
 [/card]
 [card]
-id=118891
-name=Chromatic Star
-mana={1}
-type=Artifact
-text={1}, {T}, Sacrifice Chromatic Star: Add one mana of any color to your mana pool. When Chromatic Star is put into a graveyard from play, draw a card.
-auto={1}{T}{S}:add{B}
-auto={1}{T}{S}:add{U}
-auto={1}{T}{S}:add{G}
-auto={1}{T}{S}:add{R}
-auto={1}{T}{S}:add{W}
-auto=@movedTo(...)
-rarity=U
-[/card]
-[card]
 id=106630
 name=Chronatog Totem
 mana={3}
@@ -1481,6 +1467,7 @@ subtype=Sliver
 power=2
 toughness=2
 text=All Sliver creatures have "{T}: This creature deals 2 damage to target creature or player and 3 damage to itself."
+auto=lord(sliver) {T}:damage:2 target(creature,player) && damage:3
 rarity=R
 [/card]
 [card]
@@ -1626,18 +1613,6 @@ text=Flying {2}: Search your library for a Dragon permanent card and put it into
 rarity=R
 [/card]
 [card]
-id=122387
-name=Screeching Sliver
-mana={U}
-type=Creature
-subtype=Sliver
-power=1
-toughness=1
-text=All Slivers have "{T}: Target player puts the top card of his or her library into his or her graveyard."
-auto=lord(sliver) {T}:moveTo(graveyard) target(....)
-rarity=C
-[/card]
-[card]
 id=118924
 name=Scryb Ranger
 mana={1}{G}
@@ -2098,15 +2073,6 @@ auto=lord(sliver)
 rarity=U
 [/card]
 [card]
-id=109766
-name=Verdant Embrace
-mana={3}{G}{G}
-type=Enchantment
-subtype=Aura
-text=Enchant creature Enchanted creature gets +3/+3 and has "At the beginning of each upkeep, put a 1/1 green Saproling creature token into play under your control."
-rarity=R
-[/card]
-[card]
 id=113543
 name=Vesuva
 mana=