diff --git a/projects/mtg/bin/Res/sets/BOK/todo.dat b/projects/mtg/bin/Res/sets/BOK/todo.dat
index 67d3963c4..3dc5e4543 100644
--- a/projects/mtg/bin/Res/sets/BOK/todo.dat
+++ b/projects/mtg/bin/Res/sets/BOK/todo.dat
@@ -345,7 +345,7 @@ type=Creature
 subtype=Human Warrior
 power=2
 toughness=2
-text=Whenever you cast a Spirit or Arcane spell, you may put a ki counter on Hired Muscle. At the beginning of the end step, if there are two or more ki counters on Hired Muscle, you may flip it. ---- Scarmaker Legendary Creature  ESpirit 4/4 Remove a ki counter from Scarmaker: Target creature gains fear until end of turn. (It can't be blocked except by artifact creatures and/or black creatures.)
+text=Whenever you cast a Spirit or Arcane spell, you may put a ki counter on Hired Muscle. At the beginning of the end step, if there are two or more ki counters on Hired Muscle, you may flip it. ---- Scarmaker Legendary Creature - Spirit 4/4 Remove a ki counter from Scarmaker: Target creature gains fear until end of turn. (It can't be blocked except by artifact creatures and/or black creatures.)
 rarity=U
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/sets/CHK/todo.dat b/projects/mtg/bin/Res/sets/CHK/todo.dat
index ff82440c6..6c7d5df80 100644
--- a/projects/mtg/bin/Res/sets/CHK/todo.dat
+++ b/projects/mtg/bin/Res/sets/CHK/todo.dat
@@ -166,7 +166,8 @@ type=Creature
 subtype=Human Monk
 power=2
 toughness=1
-text={T}: You may put a land card from your hand into play. If you control ten or more lands, flip Budoka Gardener. rarity=R
+text={T}: You may put a land card from your hand into play. If you control ten or more lands, flip Budoka Gardener.
+rarity=R
 [/card]
 [card]
 id=50305
@@ -995,7 +996,8 @@ type=Creature
 subtype=Fox Wizard
 power=2
 toughness=3
-text=At end of turn, if Kitsune Mystic is enchanted by two or more Auras, flip it. rarity=R
+text=At end of turn, if Kitsune Mystic is enchanted by two or more Auras, flip it.
+rarity=R
 [/card]
 [card]
 id=81702
@@ -1370,7 +1372,8 @@ type=Creature
 subtype=Snake Shaman
 power=1
 toughness=1
-text={2}{G}, {T}: Put a 1/1 green Snake creature token into play. If you control ten or more creatures, flip Orochi Eggwatcher. rarity=U
+text={2}{G}, {T}: Put a 1/1 green Snake creature token into play. If you control ten or more creatures, flip Orochi Eggwatcher.
+rarity=U
 [/card]
 [card]
 id=80241
diff --git a/projects/mtg/bin/Res/sets/CSP/_cards.dat b/projects/mtg/bin/Res/sets/CSP/_cards.dat
index cd67f3f61..360d07652 100644
--- a/projects/mtg/bin/Res/sets/CSP/_cards.dat
+++ b/projects/mtg/bin/Res/sets/CSP/_cards.dat
@@ -187,6 +187,19 @@ toughness=2
 rarity=C
 [/card]
 [card]
+name=Heidar, Rimewind Master
+id=121147
+text={2}, {T}: Return target permanent to its owner's hand. Activate this ability only if you control four or more snow permanents.
+auto=aslongas(*[snow]|myBattlefield) {2}{T}:moveTo(ownerhand) target(*) >3
+mana={4}{U}
+type=Creature
+abilities=Legendary
+subtype=Human Wizard
+power=3
+toughness=3
+rarity=R
+[/card]
+[card]
 name=Highland Weald
 id=121259
 text=Highland Weald enters the battlefield tapped. {T}: Add {R} or {G} to your mana pool.
@@ -317,6 +330,19 @@ auto=draw:2 controller
 rarity=U
 [/card]
 [card]
+name=Rimewind Taskmage
+id=121239
+text={1}, {T}: You may tap or untap target permanent. Activate this ability only if you control four or more snow permanents.
+auto=aslongas(*[snow]|myBattlefield) {1}{T}:tap target(*) >3
+auto=aslongas(*[snow]|myBattlefield) {1}{T}:untap target(*) >3
+mana={1}{U}
+type=Creature
+subtype=Human Wizard
+power=1
+toughness=2
+rarity=C
+[/card]
+[card]
 name=Rite of Flame
 id=121217
 text=Add {R}{R} to your mana pool, then add {R} to your mana pool for each card named Rite of Flame in each graveyard.
@@ -496,4 +522,4 @@ subtype=Elemental
 power=*
 toughness=3
 rarity=U
-[/card]
+[/card]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/sets/CSP/todo.dat b/projects/mtg/bin/Res/sets/CSP/todo.dat
index a9d81e4a5..b6ed4233d 100644
--- a/projects/mtg/bin/Res/sets/CSP/todo.dat
+++ b/projects/mtg/bin/Res/sets/CSP/todo.dat
@@ -409,18 +409,7 @@ power=3
 toughness=3
 rarity=R
 [/card]
-[card]
-name=Heidar, Rimewind Master
-id=121147
-text={2}, {T}: Return target permanent to its owner's hand. Activate this ability only if you control four or more snow permanents.
-mana={4}{U}
-type=Creature
-abilities=Legendary
-subtype=Human Wizard
-power=3
-toughness=3
-rarity=R
-[/card]
+
 [card]
 name=Herald of Leshrac
 id=121250
@@ -831,17 +820,7 @@ power=2
 toughness=3
 rarity=U
 [/card]
-[card]
-name=Rimewind Taskmage
-id=121239
-text={1}, {T}: You may tap or untap target permanent. Activate this ability only if you control four or more snow permanents.
-mana={1}{U}
-type=Creature
-subtype=Human Wizard
-power=1
-toughness=2
-rarity=C
-[/card]
+
 [card]
 name=Ronom Hulk
 id=121270
diff --git a/projects/mtg/bin/Res/sets/JUD/todo.dat b/projects/mtg/bin/Res/sets/JUD/todo.dat
index d458bd149..f08634ac8 100644
--- a/projects/mtg/bin/Res/sets/JUD/todo.dat
+++ b/projects/mtg/bin/Res/sets/JUD/todo.dat
@@ -56,7 +56,7 @@ id=34865
 name=Aven Warcraft
 mana={2}{W}
 type=Instant
-text=Creatures you control get +0/+2 until end of turn. Threshold  EIf seven or more cards are in your graveyard, creatures you control also gain protection from the color of your choice until end of turn.
+text=Creatures you control get +0/+2 until end of turn. Threshold - If seven or more cards are in your graveyard, creatures you control also gain protection from the color of your choice until end of turn.
 rarity=U
 [/card]
 [card]
@@ -97,7 +97,7 @@ type=Creature
 subtype=Centaur
 power=3
 toughness=3
-text=Threshold  EPut three cards from your graveyard on the bottom of your library: Battlefield Scrounger gets +3/+3 until end of turn. Activate this ability only once each turn, and only if seven or more cards are in your graveyard.
+text=Threshold - Put three cards from your graveyard on the bottom of your library: Battlefield Scrounger gets +3/+3 until end of turn. Activate this ability only once each turn, and only if seven or more cards are in your graveyard.
 rarity=C
 [/card]
 [card]
@@ -389,7 +389,7 @@ id=34209
 name=Grizzly Fate
 mana={3}{G}{G}
 type=Sorcery
-text=Put two 2/2 green Bear creature tokens onto the battlefield. Threshold  EPut four 2/2 green Bear creature tokens onto the battlefield instead if seven or more cards are in your graveyard. Flashback {5}{G}{G} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
+text=Put two 2/2 green Bear creature tokens onto the battlefield. Threshold - Put four 2/2 green Bear creature tokens onto the battlefield instead if seven or more cards are in your graveyard. Flashback {5}{G}{G} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
 rarity=U
 [/card]
 [card]
@@ -430,7 +430,7 @@ id=35167
 name=Hunting Grounds
 mana={G}{W}
 type=Enchantment
-text=Threshold  EAs long as seven or more cards are in your graveyard, Hunting Grounds has "Whenever an opponent casts a spell, you may put a creature card from your hand onto the battlefield."
+text=Threshold - As long as seven or more cards are in your graveyard, Hunting Grounds has "Whenever an opponent casts a spell, you may put a creature card from your hand onto the battlefield."
 rarity=R
 [/card]
 [card]
@@ -498,7 +498,7 @@ id=34208
 name=Lightning Surge
 mana={3}{R}{R}
 type=Sorcery
-text=Lightning Surge deals 4 damage to target creature or player. Threshold  EIf seven or more cards are in your graveyard, instead Lightning Surge deals 6 damage to that creature or player and the damage can't be prevented. Flashback {5}{R}{R} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
+text=Lightning Surge deals 4 damage to target creature or player. Threshold - If seven or more cards are in your graveyard, instead Lightning Surge deals 6 damage to that creature or player and the damage can't be prevented. Flashback {5}{R}{R} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
 rarity=R
 [/card]
 [card]
@@ -835,7 +835,7 @@ id=32209
 name=Stitch Together
 mana={B}{B}
 type=Sorcery
-text=Return target creature card from your graveyard to your hand. Threshold  EReturn that card from your graveyard to the battlefield instead if seven or more cards are in your graveyard.
+text=Return target creature card from your graveyard to your hand. Threshold - Return that card from your graveyard to the battlefield instead if seven or more cards are in your graveyard.
 rarity=U
 [/card]
 [card]
@@ -892,7 +892,7 @@ type=Creature
 subtype=Vampire
 power=4
 toughness=4
-text=Flying Whenever Treacherous Vampire attacks or blocks, sacrifice it unless you exile a card from your graveyard. Threshold  EAs long as seven or more cards are in your graveyard, Treacherous Vampire gets +2/+2 and has "When Treacherous Vampire is put into a graveyard from the battlefield, you lose 6 life."
+text=Flying Whenever Treacherous Vampire attacks or blocks, sacrifice it unless you exile a card from your graveyard. Threshold - As long as seven or more cards are in your graveyard, Treacherous Vampire gets +2/+2 and has "When Treacherous Vampire is put into a graveyard from the battlefield, you lose 6 life."
 rarity=U
 [/card]
 [card]
@@ -903,7 +903,7 @@ type=Creature
 subtype=Human Wolf Minion
 power=2
 toughness=2
-text=Threshold  EAs long as seven or more cards are in your graveyard, Treacherous Werewolf gets +2/+2 and has "When Treacherous Werewolf is put into a graveyard from the battlefield, you lose 4 life."
+text=Threshold - As long as seven or more cards are in your graveyard, Treacherous Werewolf gets +2/+2 and has "When Treacherous Werewolf is put into a graveyard from the battlefield, you lose 4 life."
 rarity=C
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/sets/NMS/_cards.dat b/projects/mtg/bin/Res/sets/NMS/_cards.dat
index 7a7e91bf6..d83dc39f0 100644
--- a/projects/mtg/bin/Res/sets/NMS/_cards.dat
+++ b/projects/mtg/bin/Res/sets/NMS/_cards.dat
@@ -97,6 +97,18 @@ power=*
 toughness=1
 [/card]
 [card]
+id=21395
+name=Complex Automaton
+mana={4}
+type=Artifact Creature
+subtype=Golem
+power=4
+toughness=4
+text=At the beginning of your upkeep, if you control seven or more permanents, return Complex Automaton to its owner's hand.
+auto=@each my upkeep:aslongas(*|myBattlefield) moveTo(myhand) >6
+rarity=R
+[/card]
+[card]
 text=When Death Pit Offering enters the battlefield, sacrifice all creatures you control.   Creatures you control get +2/+2.
 auto=bury all(creature|mybattlefield)
 auto=lord(creature|mybattlefield) 2/2
diff --git a/projects/mtg/bin/Res/sets/NMS/todo.dat b/projects/mtg/bin/Res/sets/NMS/todo.dat
index 12dd38939..5574358c1 100644
--- a/projects/mtg/bin/Res/sets/NMS/todo.dat
+++ b/projects/mtg/bin/Res/sets/NMS/todo.dat
@@ -115,17 +115,7 @@ toughness=2
 text=Flying Fading 3 (This creature enters the battlefield with three fade counters on it. At the beginning of your upkeep, remove a fade counter from it. If you can't, sacrifice it.)
 rarity=C
 [/card]
-[card]
-id=21395
-name=Complex Automaton
-mana={4}
-type=Artifact Creature
-subtype=Golem
-power=4
-toughness=4
-text=At the beginning of your upkeep, if you control seven or more permanents, return Complex Automaton to its owner's hand.
-rarity=R
-[/card]
+
 [card]
 id=21322
 name=Dark Triumph
@@ -813,6 +803,8 @@ mana={1}{G}
 type=Enchantment
 subtype=Aura
 text=Enchant creature (Target a creature as you cast this. This card enters the battlefield attached to that creature.) Enchanted creature gets +1/+1 and can't be blocked except by creatures with flying.
+target=creature
+auto=1/1
 rarity=C
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/sets/ONS/_cards.dat b/projects/mtg/bin/Res/sets/ONS/_cards.dat
index 759326e97..3d073475e 100644
--- a/projects/mtg/bin/Res/sets/ONS/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ONS/_cards.dat
@@ -863,6 +863,7 @@ auto={2}{W}{T}{S}:destroy all(enchantment)
 power=1
 toughness=2
 [/card]
+
 [card]
 text=Enchant creature   Enchanted creature can't attack or block.
 id=19729
diff --git a/projects/mtg/bin/Res/sets/ONS/todo.dat b/projects/mtg/bin/Res/sets/ONS/todo.dat
index b13bad8bd..3fcecb121 100644
--- a/projects/mtg/bin/Res/sets/ONS/todo.dat
+++ b/projects/mtg/bin/Res/sets/ONS/todo.dat
@@ -1349,6 +1349,8 @@ name=Oversold Cemetery
 mana={1}{B}
 type=Enchantment
 text=At the beginning of your upkeep, if you have four or more creature cards in your graveyard, you may return target creature card from your graveyard to your hand.
+auto=@each my upkeep:aslongas(creature|mygraveyard) may moveTo(myhand) target(creature|mygraveyard) >3
+#not working as it is intended to
 rarity=R
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/sets/SHM/_cards.dat b/projects/mtg/bin/Res/sets/SHM/_cards.dat
index 367cbe694..f9f384f8c 100644
--- a/projects/mtg/bin/Res/sets/SHM/_cards.dat
+++ b/projects/mtg/bin/Res/sets/SHM/_cards.dat
@@ -720,6 +720,16 @@ power=1
 toughness=1
 [/card]
 [card]
+text=({T}: Add {B} to your mana pool.)  Leechridden Swamp comes into play tapped.     {B}, {T}: Each opponent loses 1 life. Play this ability only if you control two or more black permanents.
+id=142020
+name=Leechridden Swamp
+auto=tap
+auto=aslongas(*[black]|myBattlefield) {B}{T}:life:-1 opponent >1
+rarity=U
+type=Land
+subtype=Swamp
+[/card]
+[card]
 id=142001
 name=Loamdragger Giant
 rarity=C
@@ -1111,6 +1121,16 @@ mana={GW}
 type=Sorcery
 [/card]
 [card]
+text=({T}: Add {G} to your mana pool.)  Sapseep Forest comes into play tapped.     {G}, {T}: You gain 1 life. Play this ability only if you control two or more green permanents.
+id=142048
+name=Sapseep Forest
+auto=tap
+auto=aslongas(*[green]|myBattlefield) {G}{T}:life:1 controller >1
+rarity=U
+type=Land
+subtype=Forest
+[/card]
+[card]
 text=Put a -1/-1 counter on target creature.
 id=142049
 auto=counter(-1/-1)
diff --git a/projects/mtg/bin/Res/sets/SHM/todo.dat b/projects/mtg/bin/Res/sets/SHM/todo.dat
index dc8804c5d..e3bb833ba 100644
--- a/projects/mtg/bin/Res/sets/SHM/todo.dat
+++ b/projects/mtg/bin/Res/sets/SHM/todo.dat
@@ -720,14 +720,7 @@ power=3
 subtype=Merfolk Soldier
 toughness=3
 [/card]
-[card]
-text=({T}: Add {B} to your mana pool.)  Leechridden Swamp comes into play tapped.     {B}, {T}: Each opponent loses 1 life. Play this ability only if you control two or more black permanents.
-id=142020
-name=Leechridden Swamp
-rarity=U
-type=Land
-subtype=Swamp
-[/card]
+
 [card]
 text=Wither (This deals damage to creatures in the form of -1/-1 counters.)  When Lockjaw Snapper is put into a graveyard from play, put a -1/-1 counter on each creature with a -1/-1 counter on it.
 id=154411
@@ -1244,14 +1237,7 @@ subtype=Elf Warrior
 toughness=2
 [/card]
 
-[card]
-text=({T}: Add {G} to your mana pool.)  Sapseep Forest comes into play tapped.     {G}, {T}: You gain 1 life. Play this ability only if you control two or more green permanents.
-id=142048
-name=Sapseep Forest
-rarity=U
-type=Land
-subtype=Forest
-[/card]
+
 [card]
 text=Take an extra turn after this one. Skip the untap step of that turn.
 id=159404
diff --git a/projects/mtg/bin/Res/sets/SOK/_cards.dat b/projects/mtg/bin/Res/sets/SOK/_cards.dat
index 0f127984b..f59e4bb05 100644
--- a/projects/mtg/bin/Res/sets/SOK/_cards.dat
+++ b/projects/mtg/bin/Res/sets/SOK/_cards.dat
@@ -253,6 +253,7 @@ power=2
 toughness=1
 rarity=C
 [/card]
+
 [card]
 text=Masumaro, First to Live's power and toughness are each equal to twice the number of cards in your hand.
 name=Masumaro, First to Live
@@ -421,6 +422,15 @@ toughness=1
 rarity=C
 [/card]
 [card]
+text={2}, {T}: Draw a card if you have seven or more cards in hand.
+name=Scroll of Origins
+auto=aslongas(*|myhand) {2}{T}:draw:1 >6
+id=88811
+mana={2}
+type=Artifact
+rarity=R
+[/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.
 name=Soramaro, First to Dream
 id=74170
diff --git a/projects/mtg/bin/Res/sets/SOK/todo.dat b/projects/mtg/bin/Res/sets/SOK/todo.dat
index 2da59c49b..302322e6b 100644
--- a/projects/mtg/bin/Res/sets/SOK/todo.dat
+++ b/projects/mtg/bin/Res/sets/SOK/todo.dat
@@ -548,6 +548,8 @@ rarity=C
 [card]
 text=At the beginning of your upkeep, if you have seven or more cards in hand, you gain 4 life.
 name=Ivory Crane Netsuke
+auto=@each my upkeep:aslongas(*|myhand) life:4 controller >6
+## dont think @each works with aslongas + >X
 id=88796
 mana={2}
 type=Artifact
@@ -670,10 +672,16 @@ text=Kiyomaro, First to Stand's power and toughness are each equal to the number
 name=Kiyomaro, First to Stand
 id=74054
 mana={3}{W}{W}
-type=Legendary Creature
+type=Creature
 subtype=Spirit
+auto=foreach(*|myhand) 1/1
+auto=aslongas(*|myhand) vigilance >3
+auto=@damaged(player) from(this):aslongas(*|myhand) life:7 controller >6
+auto=@damaged(creature) from(this):aslongas(*|myhand) life:7 controller >6
+##need more testing, I don't think the life gaining is working
 power=*
 toughness=*
+abilities=legendary
 rarity=R
 [/card]
 [card]
@@ -1042,14 +1050,7 @@ mana={1}{G}{G}
 type=Legendary Enchantment
 rarity=R
 [/card]
-[card]
-text={2}, {T}: Draw a card if you have seven or more cards in hand.
-name=Scroll of Origins
-id=88811
-mana={2}
-type=Artifact
-rarity=R
-[/card]
+
 [card]
 text=As long as you have more cards in hand than each opponent, Secretkeeper gets +2/+2 and has flying.
 name=Secretkeeper
diff --git a/projects/mtg/bin/Res/sets/STH/_cards.dat b/projects/mtg/bin/Res/sets/STH/_cards.dat
index e980f8ca8..1e24c19a1 100644
--- a/projects/mtg/bin/Res/sets/STH/_cards.dat
+++ b/projects/mtg/bin/Res/sets/STH/_cards.dat
@@ -581,6 +581,19 @@ type=Land
 abilities=legendary
 [/card]
 [card]
+id=5264
+name=Walking Dream
+mana={3}{U}
+type=Creature
+subtype=Illusion
+power=3
+toughness=3
+text=Walking Dream is unblockable.  Walking Dream doesn't untap during your untap step if an opponent controls two or more creatures.
+auto=aslongas(creature|opponentinplay) doesnotuntap >1
+abilities=unblockable
+rarity=U
+[/card]
+[card]
 text=Defender   When Wall of Blossoms enters the battlefield, draw a card.
 id=5265
 auto=draw:1 controller
diff --git a/projects/mtg/bin/Res/sets/STH/todo.dat b/projects/mtg/bin/Res/sets/STH/todo.dat
index 3219f07b8..7fc61706b 100644
--- a/projects/mtg/bin/Res/sets/STH/todo.dat
+++ b/projects/mtg/bin/Res/sets/STH/todo.dat
@@ -823,17 +823,7 @@ text=As long as the top card of your graveyard is a creature card, Volrath's Sha
 rarity=R
 [/card]
 
-[card]
-id=5264
-name=Walking Dream
-mana={3}{U}
-type=Creature
-subtype=Illusion
-power=3
-toughness=3
-text=Walking Dream is unblockable.  Walking Dream doesn't untap during your untap step if an opponent controls two or more creatures.
-rarity=U
-[/card]
+
 
 [card]
 id=5267