diff --git a/projects/mtg/bin/Res/sets/SCG/_cards.dat b/projects/mtg/bin/Res/sets/SCG/_cards.dat
index 804752c9d..2526429c3 100644
--- a/projects/mtg/bin/Res/sets/SCG/_cards.dat
+++ b/projects/mtg/bin/Res/sets/SCG/_cards.dat
@@ -328,13 +328,26 @@ mana={R}
 type=Instant
 [/card]
 [card]
+text={T}: Add {2} to your mana pool. Activate this ability only if you control five or more lands.
 id=44336
 name=Temple of the False God
-type=Land
-text={T}: Add {2} to your mana pool. Activate this ability only if you control five or more lands.
+auto=aslongas(land|myBattlefield){T}:add{2} >5
 rarity=U
-auto=aslongas(land|myBattlefield){T}:add{2} >4
-#Tested works fine you only need to have four land and temple of the false god as this card is also a land... wonder if this is correct.. if not can simply change the 4 by a 5.
+type=Land
+[/card]
+[card]
+text=Flying   {3}{U}: Tap all creatures with toughness 2 or less.   {3}{U}: All other creatures lose flying until end of turn.
+id=43606
+name=Thundercloud Elemental
+rarity=U
+mana={5}{U}{U}
+type=Creature
+subtype=Elemental
+auto={3}{U}:tap all(creature[toughness<=2])
+auto={3}{U}:lord(other creature) -flying ueot
+power=3
+toughness=4
+abilities=flying
 [/card]
 [card]
 text={B}: Regenerate Twisted Abomination.   Swampcycling {2} ({2}, Discard this card: Search your library for a Swamp card, reveal it, and put it into your hand. Then shuffle your library.)
diff --git a/projects/mtg/bin/Res/sets/SCG/todo.dat b/projects/mtg/bin/Res/sets/SCG/todo.dat
index 849888332..ed573ef22 100644
--- a/projects/mtg/bin/Res/sets/SCG/todo.dat
+++ b/projects/mtg/bin/Res/sets/SCG/todo.dat
@@ -951,17 +951,6 @@ auto=life:2 controller
 rarity=U
 [/card]
 [card]
-id=43606
-name=Thundercloud Elemental
-mana={5}{U}{U}
-type=Creature
-subtype=Elemental
-power=3
-toughness=4
-text=Flying {3}{U}: Tap all creatures with toughness 2 or less. {3}{U}: All other creatures lose flying until end of turn.
-rarity=U
-[/card]
-[card]
 id=46691
 name=Titanic Bulvox
 mana={6}{G}{G}
diff --git a/projects/mtg/bin/Res/sets/STH/_cards.dat b/projects/mtg/bin/Res/sets/STH/_cards.dat
index 99bf816ab..9698c2f25 100644
--- a/projects/mtg/bin/Res/sets/STH/_cards.dat
+++ b/projects/mtg/bin/Res/sets/STH/_cards.dat
@@ -153,6 +153,18 @@ toughness=1
 abilities=flying
 [/card]
 [card]
+text=When you control a creature with toughness 2 or less, sacrifice Endangered Armodon.
+id=5145
+name=Endangered Armodon
+rarity=C
+mana={2}{G}{G}
+type=Creature
+subtype=Elephant
+auto=aslongas(creature[toughness<=2]|myBattlefield) -99/-99
+power=4
+toughness=5
+[/card]
+[card]
 text=Return all creatures to their owners' hands.
 id=5147
 name=Evacuation
diff --git a/projects/mtg/bin/Res/sets/STH/todo.dat b/projects/mtg/bin/Res/sets/STH/todo.dat
index ea9418c79..b08206cda 100644
--- a/projects/mtg/bin/Res/sets/STH/todo.dat
+++ b/projects/mtg/bin/Res/sets/STH/todo.dat
@@ -53,7 +53,6 @@ type=Sorcery
 text=Choose two target creatures controlled by the same player. Exile one of those creatures and put two +1/+1 counters on the other.
 rarity=C
 [/card]
-
 [card]
 id=5121
 name=Change of Heart
@@ -62,7 +61,6 @@ type=Instant
 text=Buyback {3} (You may pay an additional {3} as you cast this spell. If you do, put this card into your hand as it resolves.) Target creature can't attack this turn.
 rarity=C
 [/card]
-
 [card]
 id=5123
 name=Constant Mists
@@ -71,7 +69,6 @@ type=Instant
 text=Buyback—Sacrifice a land. (You may sacrifice a land in addition to any other costs as you cast this spell. If you do, put this card into your hand as it resolves.) Prevent all combat damage that would be dealt this turn.
 rarity=U
 [/card]
-
 [card]
 id=5126
 name=Contempt
@@ -81,7 +78,6 @@ subtype=Aura
 text=Enchant creature Whenever enchanted creature attacks, return it and Contempt to their owners' hands at end of combat.
 rarity=C
 [/card]
-
 [card]
 id=5129
 name=Convulsing Licid
@@ -104,8 +100,6 @@ toughness=2
 text={B}, {T}: Corrupting Licid loses this ability and becomes an Aura enchantment with enchant creature. Attach it to target creature. You may pay {B} to end this effect. Enchanted creature has fear. (It can't be blocked except by artifact creatures and/or black creatures.)
 rarity=U
 [/card]
-
-
 [card]
 text=Crovax the Cursed enters the battlefield with four +1/+1 counters on it. At the beginning of your upkeep, you may sacrifice a creature. If you do, put a +1/+1 counter on Crovax. If you don't, remove a +1/+1 counter from Crovax. {B}: Crovax gains flying until end of turn.
 id=5106
@@ -150,7 +144,6 @@ toughness=1
 text={1}{R}: Target creature can't block Duct Crawler this turn.
 rarity=C
 [/card]
-
 [card]
 id=5144
 name=Elven Rite
@@ -160,17 +153,6 @@ text=Distribute two +1/+1 counters among one or two target creatures.
 rarity=U
 [/card]
 [card]
-id=5145
-name=Endangered Armodon
-mana={2}{G}{G}
-type=Creature
-subtype=Elephant
-power=4
-toughness=5
-text=When you control a creature with toughness 2 or less, sacrifice Endangered Armodon.
-rarity=C
-[/card]
-[card]
 id=5124
 name=Ensnaring Bridge
 mana={3}
@@ -178,7 +160,6 @@ type=Artifact
 text=Creatures with power greater than the number of cards in your hand can't attack.
 rarity=R
 [/card]
-
 [card]
 id=5148
 name=Fanning the Flames
@@ -222,7 +203,6 @@ type=Enchantment
 text=Whenever a creature you control is put into a graveyard from the battlefield, each other player sacrifices a creature.
 rarity=R
 [/card]
-
 [card]
 id=5164
 name=Heartstone
diff --git a/projects/mtg/bin/Res/sets/TSP/_cards.dat b/projects/mtg/bin/Res/sets/TSP/_cards.dat
index fc3e0683d..5a876f3b4 100644
--- a/projects/mtg/bin/Res/sets/TSP/_cards.dat
+++ b/projects/mtg/bin/Res/sets/TSP/_cards.dat
@@ -168,6 +168,18 @@ toughness=1
 abilities=flash
 [/card]
 [card]
+text={T}: Tap target creature with toughness 2 or less.
+id=116379
+name=Errant Doomsayers
+rarity=C
+mana={1}{W}
+type=Creature
+subtype=Human Rebel
+auto={T}:tap target(creature[toughness<=2])
+power=1
+toughness=1
+[/card]
+[card]
 text=Enchant creature   When Eternity Snare enters the battlefield, draw a card.   Enchanted creature doesn't untap during its controller's untap step.
 id=108788
 target=creature
diff --git a/projects/mtg/bin/Res/sets/TSP/todo.dat b/projects/mtg/bin/Res/sets/TSP/todo.dat
index 89538c8ed..edd292cf9 100644
--- a/projects/mtg/bin/Res/sets/TSP/todo.dat
+++ b/projects/mtg/bin/Res/sets/TSP/todo.dat
@@ -518,17 +518,6 @@ text=Whenever you play a creature spell, put X 1/1 black Thrull creature tokens
 rarity=R
 [/card]
 [card]
-id=116379
-name=Errant Doomsayers
-mana={1}{W}
-type=Creature
-subtype=Human Rebel
-power=1
-toughness=1
-text={T}: Tap target creature with toughness 2 or less.
-rarity=C
-[/card]
-[card]
 id=108909
 name=Errant Ephemeron
 mana={6}{U}