diff --git a/projects/mtg/bin/Res/sets/CHK/_cards.dat b/projects/mtg/bin/Res/sets/CHK/_cards.dat
index 5104cf636..db971897b 100644
--- a/projects/mtg/bin/Res/sets/CHK/_cards.dat
+++ b/projects/mtg/bin/Res/sets/CHK/_cards.dat
@@ -558,6 +558,19 @@ power=2
 toughness=2
 [/card]
 [card]
+text=Flying   When Keiga, the Tide Star is put into a graveyard from the battlefield, gain control of target creature.
+auto=@movedTo(this|graveyard) from(battlefield):moveTo(myBattlefield) target(creature)
+id=75286
+name=Keiga, the Tide Star
+rarity=R
+mana={5}{U}
+type=Legendary Creature
+subtype=Dragon Spirit
+power=5
+toughness=5
+abilities=flying
+[/card]
+[card]
 text={T}: Tap target Spirit.
 id=76652
 name=Kitsune Diviner
diff --git a/projects/mtg/bin/Res/sets/CHK/todo.dat b/projects/mtg/bin/Res/sets/CHK/todo.dat
index 635afed4a..c0abbbfda 100644
--- a/projects/mtg/bin/Res/sets/CHK/todo.dat
+++ b/projects/mtg/bin/Res/sets/CHK/todo.dat
@@ -844,19 +844,6 @@ text=Whenever Kashi-Tribe Warriors deals combat damage to a creature, tap that c
 rarity=C
 [/card]
 [card]
-id=75286
-name=Keiga, the Tide Star
-mana={5}{U}
-type=Creature
-subtype=Dragon Spirit
-power=5
-toughness=5
-text=Flying. When Keiga, the Tide Star is put into a graveyard from play, gain control of target creature.
-abilities=legendary,flying
-auto=@movedTo(this|graveyard) from(inplay):moveTo(myinplay) target(creature)
-rarity=R
-[/card]
-[card]
 id=78600
 name=Bushi Tenderfoot (Kenzo the Hardhearted)
 mana={W}
diff --git a/projects/mtg/bin/Res/sets/CSP/_cards.dat b/projects/mtg/bin/Res/sets/CSP/_cards.dat
index 0409ea6c7..aea7134ab 100644
--- a/projects/mtg/bin/Res/sets/CSP/_cards.dat
+++ b/projects/mtg/bin/Res/sets/CSP/_cards.dat
@@ -369,7 +369,7 @@ toughness=2
 [/card]
 [card]
 text=Whenever another nontoken creature you control is put into a graveyard from the battlefield, put a 3/1 black and red Graveborn creature token with haste onto the battlefield.
-auto=@movedto(creature|myGraveyard) from(myBattlefield):token(Graveborn, Creature Graveborn,3/1,haste red black)
+auto=@movedto(other creature|myGraveyard) from(myBattlefield):token(Graveborn, Creature Graveborn,3/1,haste red black)
 id=121261
 name=Sek'Kuar, Deathkeeper
 rarity=R
diff --git a/projects/mtg/bin/Res/sets/LRW/_cards.dat b/projects/mtg/bin/Res/sets/LRW/_cards.dat
index 2e3037fd1..0cb71f7f0 100644
--- a/projects/mtg/bin/Res/sets/LRW/_cards.dat
+++ b/projects/mtg/bin/Res/sets/LRW/_cards.dat
@@ -535,6 +535,18 @@ toughness=5
 abilities=vigilance,trample,haste
 [/card]
 [card]
+text=When Hornet Harasser is put into a graveyard from the battlefield, target creature gets -2/-2 until end of turn.
+auto=@movedTo(this|graveyard) from(battlefield):-2/-2 target(creature) ueot
+id=142355
+name=Hornet Harasser
+rarity=C
+type=Creature
+mana={2}{B}{B}
+power=2
+subtype=Goblin Shaman
+toughness=2
+[/card]
+[card]
 text=Choose one - Hurly-Burly deals 1 damage to each creature without flying; or Hurly-Burly deals 1 damage to each creature with flying.
 id=143381
 auto=may damage:1 all(creature(-flying)
@@ -820,6 +832,18 @@ type=Basic Land
 subtype=Mountain
 [/card]
 [card]
+text=When Mudbutton Torchrunner is put into a graveyard from the battlefield, it deals 3 damage to target creature or player.
+auto=@movedTo(this|graveyard):damage:3 target(creature,player)
+id=139742
+name=Mudbutton Torchrunner
+rarity=C
+mana={2}{R}
+type=Creature
+subtype=Goblin Warrior
+power=1
+toughness=1
+[/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 onto the battlefield.
 id=143370
 auto=@each my upkeep:may discard:1 opponent
diff --git a/projects/mtg/bin/Res/sets/LRW/todo.dat b/projects/mtg/bin/Res/sets/LRW/todo.dat
index 7a12e90f0..69b78aa5e 100644
--- a/projects/mtg/bin/Res/sets/LRW/todo.dat
+++ b/projects/mtg/bin/Res/sets/LRW/todo.dat
@@ -798,18 +798,6 @@ mana={1}{W}
 subtype=Elemental
 [/card]
 [card]
-text=When Hornet Harasser is put into a graveyard from play, target creature gets -2/-2 until end of turn.
-auto=@movedTo(this|graveyard):-2/-2 target(creature)
-id=142355
-name=Hornet Harasser
-rarity=C
-type=Creature
-mana={2}{B}{B}
-power=2
-subtype=Goblin Shaman
-toughness=2
-[/card]
-[card]
 text=Haste     If a spell you control would deal damage to an opponent, prevent that damage. Put a 3/1 red Elemental Shaman creature token with haste into play for each 1 damage prevented this way.     When Hostility is put into a graveyard from anywhere, shuffle it into its owner's library.
 id=140164
 name=Hostility
@@ -1137,19 +1125,6 @@ subtype=Elemental
 toughness=3
 [/card]
 [card]
-text=When Mudbutton Torchrunner is put into a graveyard from play, it deals 3 damage to target creature or player.
-auto=@movedTo(this|graveyard):damage:3 target(creature,player)
-#@movedTo does not work with target unless there is a "may"
-id=139742
-name=Mudbutton Torchrunner
-rarity=C
-type=Creature
-mana={2}{R}
-power=1
-subtype=Goblin Warrior
-toughness=1
-[/card]
-[card]
 text=Flying     When Mulldrifter comes into play, draw two cards.     Evoke {2}{U} (You may play this spell for its evoke cost. If you do, it's sacrificed when it comes into play.)
 id=145811
 name=Mulldrifter
diff --git a/projects/mtg/bin/Res/sets/MRD/_cards.dat b/projects/mtg/bin/Res/sets/MRD/_cards.dat
index 272bbaa4f..b8961367d 100644
--- a/projects/mtg/bin/Res/sets/MRD/_cards.dat
+++ b/projects/mtg/bin/Res/sets/MRD/_cards.dat
@@ -774,7 +774,7 @@ power=1
 toughness=3
 [/card]
 [card]
-text=Flying At the beginning of your upkeep, you may put a 1/1 white Spirit creature token with flying onto the battlefield.
+text=Flying   At the beginning of your upkeep, you may put a 1/1 white Spirit creature token with flying onto the battlefield.
 auto=@each my upkeep:may token(Spirit,Creature Spirit,1/1,white flying)
 id=46546
 name=Luminous Angel
@@ -788,13 +788,13 @@ abilities=flying
 [/card]
 [card]
 text={1}{G}: Malachite Golem gains trample until end of turn.
-auto={1}{G}:trample
 id=48056
 name=Malachite Golem
 rarity=C
 mana={6}
 type=Artifact Creature
 subtype=Golem
+auto={1}{G}:trample
 power=5
 toughness=3
 [/card]
@@ -809,25 +809,25 @@ type=Enchantment
 [/card]
 [card]
 text=Sacrifice an artifact: Megatog gets +3/+3 and gains trample until end of turn.
-auto={S(artifact|myBattlefield)}:3/3 && trample
 id=46579
 name=Megatog
 rarity=R
 mana={4}{R}{R}
 type=Creature
 subtype=Atog
+auto={S(artifact|myBattlefield)}:3/3 && trample
 power=3
 toughness=4
 [/card]
 [card]
 text=When Moriok Scavenger enters the battlefield, you may return target artifact creature card from your graveyard to your hand.
-auto=may moveTo(myhand) target(artifact|mygraveyard)
 id=45965
 name=Moriok Scavenger
 rarity=C
 mana={3}{B}
 type=Creature
 subtype=Human Rogue
+auto=may moveTo(myhand) target(artifact|mygraveyard)
 power=2
 toughness=3
 [/card]
@@ -868,6 +868,19 @@ rarity=L
 subtype=Mountain
 [/card]
 [card]
+text=When Myr Retriever is put into a graveyard from the battlefield, return another target artifact card from your graveyard to your hand.
+auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) target(other artifact|mygraveyard)
+
+id=46126
+name=Myr Retriever
+rarity=U
+mana={2}
+type=Artifact Creature
+subtype=Myr
+power=1
+toughness=1
+[/card]
+[card]
 text=Flash   Protection from artifacts
 id=48930
 name=Needlebug
diff --git a/projects/mtg/bin/Res/sets/MRD/todo.dat b/projects/mtg/bin/Res/sets/MRD/todo.dat
index 3f504a687..9706ee8b7 100644
--- a/projects/mtg/bin/Res/sets/MRD/todo.dat
+++ b/projects/mtg/bin/Res/sets/MRD/todo.dat
@@ -81,7 +81,6 @@ rarity=U
 type=Sorcery
 mana={2}{B}{B}
 [/card]
-
 [card]
 text=Choose one - Destroy target creature; or return target creature card from your graveyard to play.     Entwine-Sacrifice three lands. (Choose both if you pay the entwine cost.)
 id=48588
@@ -114,7 +113,6 @@ rarity=U
 type=Instant
 mana={3}{G}
 [/card]
-
 [card]
 text=Trample     {3}{R}, Sacrifice an artifact: Bosh, Iron Golem deals damage equal to the sacrificed artifact's converted mana cost to target creature or player.
 id=48581
@@ -148,7 +146,6 @@ power=1
 subtype=Ouphe
 toughness=1
 [/card]
-
 [card]
 text=Chalice of the Void comes into play with X charge counters on it.     Whenever a player plays a spell with converted mana cost equal to the number of charge counters on Chalice of the Void, counter that spell.
 id=48326
@@ -168,7 +165,6 @@ power=1
 subtype=Imp
 toughness=2
 [/card]
-
 [card]
 text=Imprint - When Chrome Mox comes into play, you may remove a nonartifact, nonland card in your hand from the game. (The removed card is imprinted on this artifact.)  {T}: Add one mana of any of the imprinted card's colors to your mana pool.
 id=47446
@@ -333,7 +329,6 @@ rarity=C
 type=Instant
 mana={R}
 [/card]
-
 [card]
 text=Imprint - When Extraplanar Lens comes into play, you may remove target land you control from the game. (The removed card is imprinted on this artifact.)  Whenever a land with the same name as the imprinted card is tapped for mana, its controller adds one mana to his or her mana pool of any type that land produced.
 id=49440
@@ -342,7 +337,6 @@ rarity=R
 type=Artifact
 mana={3}
 [/card]
-
 [card]
 text=Whenever a source an opponent controls deals damage to you, if Farsight Mask is untapped, you may draw a card.
 id=46135
@@ -353,7 +347,6 @@ rarity=U
 type=Artifact
 mana={5}
 [/card]
-
 [card]
 text=At the beginning of each opponent's upkeep, that player chooses draw step, main phase, or combat phase. The player skips each instance of the chosen step or phase this turn.
 id=45970
@@ -373,7 +366,6 @@ rarity=R
 type=Sorcery
 mana={2}{R}
 [/card]
-
 [card]
 text=Whenever Flayed Nim deals combat damage to a creature, that creature's controller loses that much life. {2}{B}: Regenerate Flayed Nim.
 id=46094
@@ -470,7 +462,6 @@ rarity=U
 type=Instant
 mana={3}{R}
 [/card]
-
 [card]
 text=You can't play creature spells.
 id=48178
@@ -518,8 +509,6 @@ rarity=C
 type=Instant
 mana={2}{R}
 [/card]
-
-
 [card]
 text=Imprint - When Isochron Scepter comes into play, you may remove an instant card with converted mana cost 2 or less in your hand from the game. (The removed card is imprinted on this artifact.)  {2}, {T}: You may copy the imprinted instant card. If you do, you may play the copy without paying its mana cost.
 id=46741
@@ -544,8 +533,6 @@ rarity=C
 type=Sorcery
 mana={2}{G}
 [/card]
-
-
 [card]
 text=If you would flip a coin, instead flip two coins and ignore one.
 id=48923
@@ -554,7 +541,6 @@ rarity=R
 type=Legendary Artifact
 mana={2}
 [/card]
-
 [card]
 text=As long as Leonin Den-Guard is equipped, it gets +1/+1 and has vigilance.
 id=45958
@@ -566,7 +552,6 @@ power=1
 subtype=Cat Soldier
 toughness=3
 [/card]
-
 [card]
 text={2}, {T}: Name a card. Target opponent guesses whether a card with that name is in your hand. You may reveal your hand. If you do and your opponent guessed wrong, draw a card.
 id=46733
@@ -591,7 +576,6 @@ rarity=R
 type=Artifact
 mana={3}
 [/card]
-
 [card]
 text=Trample     Whenever Living Hive deals combat damage to a player, put that many 1/1 green Insect creature tokens into play.
 id=46694
@@ -725,7 +709,6 @@ toughness=6
 text=Destroy target land. If that land was nonbasic, Molten Rain deals 2 damage to the land's controller.
 id=46000
 target=land
-auto=destroy && aslongas(-basic):damage:2 targetcontroller
 name=Molten Rain
 rarity=C
 type=Sorcery
@@ -792,17 +775,6 @@ subtype=Myr
 toughness=2
 [/card]
 [card]
-text=When Myr Retriever is put into a graveyard from play, return another target artifact card from your graveyard to your hand.
-id=46126
-name=Myr Retriever
-rarity=U
-type=Artifact Creature
-mana={2}
-power=1
-subtype=Myr
-toughness=1
-[/card]
-[card]
 text=At the beginning of each player's upkeep, that player discards a card.
 id=48589
 name=Necrogen Mists
diff --git a/projects/mtg/bin/Res/sets/POR/_cards.dat b/projects/mtg/bin/Res/sets/POR/_cards.dat
index f1c04e482..2bd76c964 100644
--- a/projects/mtg/bin/Res/sets/POR/_cards.dat
+++ b/projects/mtg/bin/Res/sets/POR/_cards.dat
@@ -1546,6 +1546,28 @@ mana={3}{U}
 type=Sorcery
 [/card]
 [card]
+text=When Undying Beast is put into a graveyard from the battlefield, put Undying Beast on top of its owner's library.
+auto=@movedTo(this|graveyard) from(battlefield):moveTo(mylibrary) notatarget(undying beast|mygraveyard)
+id=4242
+name=Undying Beast
+rarity=C
+mana={3}{B}
+type=Creature
+subtype=Beast
+power=3
+toughness=2
+[/card]
+[card]
+text=Search your library for a basic land card and put that card onto the battlefield. Then shuffle your library.
+id=4323
+target=land[basic]|myLibrary
+auto=moveTo(myBattlefield)
+name=Untamed Wilds
+rarity=U
+mana={2}{G}
+type=Sorcery
+[/card]
+[card]
 text=White creatures get +2/+0 until end of turn.
 id=4402
 auto=lord(creature[white]) 2/0
@@ -1564,16 +1586,6 @@ mana={2}{W}
 type=Sorcery
 [/card]
 [card]
-text=Search your library for a basic land card and put that card onto the battlefield. Then shuffle your library.
-id=4323
-target=land[basic]|myLibrary
-auto=moveTo(myBattlefield)
-name=Untamed Wilds
-rarity=U
-mana={2}{G}
-type=Sorcery
-[/card]
-[card]
 text=Vampiric Feast deals 4 damage to target creature or player and you gain 4 life.
 id=4243
 target=creature,player
diff --git a/projects/mtg/bin/Res/sets/POR/todo.dat b/projects/mtg/bin/Res/sets/POR/todo.dat
index 963b1e994..298f4109c 100644
--- a/projects/mtg/bin/Res/sets/POR/todo.dat
+++ b/projects/mtg/bin/Res/sets/POR/todo.dat
@@ -415,17 +415,6 @@ type=Instant
 mana={1}{G}
 [/card]
 [card]
-text=When Undying Beast is put into a graveyard from play, put Undying Beast on top of its owner's library.
-id=4242
-name=Undying Beast
-rarity=C
-type=Creature
-mana={3}{B}
-power=3
-subtype=Beast
-toughness=2
-[/card]
-[card]
 text=Destroy two target nonblack creatures. You lose 5 life.
 id=4246
 name=Wicked Pact
diff --git a/projects/mtg/bin/Res/sets/TMP/todo.dat b/projects/mtg/bin/Res/sets/TMP/todo.dat
index d5ae7494f..c4295eecb 100644
--- a/projects/mtg/bin/Res/sets/TMP/todo.dat
+++ b/projects/mtg/bin/Res/sets/TMP/todo.dat
@@ -1073,7 +1073,6 @@ power=1
 subtype=Human Cleric
 toughness=1
 [/card]
-
 [card]
 text=Blue spells you play cost {1} less to play.
 id=4626
diff --git a/projects/mtg/bin/Res/sets/TSP/_cards.dat b/projects/mtg/bin/Res/sets/TSP/_cards.dat
index e97571e2c..076402e1e 100644
--- a/projects/mtg/bin/Res/sets/TSP/_cards.dat
+++ b/projects/mtg/bin/Res/sets/TSP/_cards.dat
@@ -745,6 +745,18 @@ power=2
 toughness=2
 [/card]
 [card]
+text=Enchant creature you control   Enchanted creature has lifelink. (Whenever it deals damage, its controller gains that much life.)   When Spirit Loop is put into a graveyard from the battlefield, return Spirit Loop to its owner's hand.
+auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(spirit loop|mygraveyard)
+id=109680
+target=creature|myBattlefield
+auto=lifelink
+name=Spirit Loop
+rarity=U
+mana={1}{W}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 text=Flying   Other creatures you control with flying get +0/+1.   {T}: Other creatures you control with flying get +1/+0 until end of turn.
 id=116386
 name=Sprite Noble
@@ -956,6 +968,19 @@ auto=aslongas(island|myBattlefield) lord(creature|myBattlefield) 1/1
 auto=lord(creature|myBattlefield) trample
 [/card]
 [card]
+text=Enchant creature   Enchanted creature gets +2/+2 and can't block.   When Undying Rage is put into a graveyard from the battlefield, return Undying Rage to its owner's hand.
+auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(undying rage|mygraveyard)
+id=126280
+target=creature
+auto=2/2
+auto=cantblock
+name=Undying Rage
+rarity=U
+mana={2}{R}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 text={G}: Unyaro Bees gets +1/+1 until end of turn.   {3}{G}, Sacrifice Unyaro Bees: Unyaro Bees deals 2 damage to target creature or player.
 auto={G}:1/1
 auto={3}{G}{S}:Damage:2 target(creature,player)
diff --git a/projects/mtg/bin/Res/sets/TSP/todo.dat b/projects/mtg/bin/Res/sets/TSP/todo.dat
index a784820e2..21d40b326 100644
--- a/projects/mtg/bin/Res/sets/TSP/todo.dat
+++ b/projects/mtg/bin/Res/sets/TSP/todo.dat
@@ -1628,15 +1628,6 @@ text=Flying Sacrifice Spiketail Drakeling: Counter target spell unless its contr
 rarity=C
 [/card]
 [card]
-id=109680
-name=Spirit Loop
-mana={1}{W}
-type=Enchantment
-subtype=Aura
-text=Enchant creature you control Enchanted creature has lifelink. (Whenever it deals damage, its controller gains that much life.) When Spirit Loop is put into a graveyard from play, return Spirit Loop to its owner's hand.
-rarity=U
-[/card]
-[card]
 id=111068
 name=Sporesower Thallid
 mana={2}{G}{G}
@@ -1885,15 +1876,6 @@ text=All Sliver creatures have "This creature can't be blocked except by two or
 rarity=C
 [/card]
 [card]
-id=126280
-name=Undying Rage
-mana={2}{R}
-type=Enchantment
-subtype=Aura
-text=Enchant creature Enchanted creature gets +2/+2 and can't block. When Undying Rage is put into a graveyard from play, return Undying Rage to its owner's hand.
-rarity=U
-[/card]
-[card]
 id=118900
 name=Vampiric Sliver
 mana={3}{B}
diff --git a/projects/mtg/bin/Res/sets/UDS/_cards.dat b/projects/mtg/bin/Res/sets/UDS/_cards.dat
index 3935dbf9f..0dfeee383 100644
--- a/projects/mtg/bin/Res/sets/UDS/_cards.dat
+++ b/projects/mtg/bin/Res/sets/UDS/_cards.dat
@@ -309,6 +309,30 @@ toughness=2
 abilities=first strike,haste
 [/card]
 [card]
+text=When Goblin Gardener is put into a graveyard from the battlefield, destroy target land.
+id=15197
+name=Goblin Gardener
+rarity=C
+mana={3}{R}
+type=Creature
+subtype=Goblin
+auto=@movedTo(this|graveyard) from(battlefield):destroy target(artifact)
+power=2
+toughness=1
+[/card]
+[card]
+text=When Goblin Masons is put into a graveyard from the battlefield, destroy target Wall.
+id=15202
+name=Goblin Masons
+rarity=C
+mana={1}{R}
+type=Creature
+subtype=Goblin
+auto=@movedTo(this|graveyard) from(battlefield):destroy target(wall)
+power=2
+toughness=1
+[/card]
+[card]
 text=Trample
 id=15223
 name=Goliath Beetle
@@ -358,6 +382,20 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+text=Flying   When Junk Diver is put into a graveyard from the battlefield, return another target artifact card from your graveyard to your hand.
+auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) target(other artifact|mygraveyard)
+
+id=15256
+name=Junk Diver
+rarity=R
+mana={3}
+type=Artifact Creature
+subtype=Bird
+power=1
+toughness=1
+abilities=flying
+[/card]
+[card]
 text=Flying   When Kingfisher is put into a graveyard from the battlefield, draw a card.
 id=15147
 name=Kingfisher
@@ -381,18 +419,32 @@ type=Instant
 [/card]
 [card]
 text={2}: Mantis Engine gains flying until end of turn. (It can't be blocked except by creatures with flying or reach.)   {2}: Mantis Engine gains first strike until end of turn. (It deals combat damage before creatures without first strike.)
-auto={2}:flying
-auto={2}:first strike
 id=15247
 name=Mantis Engine
 rarity=U
 mana={5}
 type=Artifact Creature
 subtype=Insect
+auto={2}:flying
+auto={2}:first strike
 power=3
 toughness=3
 [/card]
 [card]
+text=When Marker Beetles is put into a graveyard from the battlefield, target creature gets +1/+1 until end of turn.   {2}, Sacrifice Marker Beetles: Draw a card.
+auto=@movedTo(this|graveyard) from(battlefield):1/1 target(creature|battlefield)
+ ueot
+id=15222
+name=Marker Beetles
+rarity=C
+mana={1}{G}{G}
+type=Creature
+subtype=Insect
+auto={S}:draw:1
+power=2
+toughness=3
+[/card]
+[card]
 text={1}, Discard a card: Draw a card.
 id=15158
 name=Mental Discipline
@@ -463,6 +515,18 @@ toughness=4
 abilities=reach
 [/card]
 [card]
+text=When Reliquary Monk is put into a graveyard from the battlefield, destroy target artifact or enchantment.
+id=15123
+name=Reliquary Monk
+rarity=C
+mana={2}{W}
+type=Creature
+subtype=Human Monk Cleric
+auto=@movedTo(this|mygraveyard) from(battlefield):destroy target(artifact,enchantment)
+power=2
+toughness=2
+[/card]
+[card]
 text=Return all enchantment cards from your graveyard to the battlefield. (Auras with nothing to enchant remain in your graveyard.)
 id=15143
 name=Replenish
@@ -473,9 +537,9 @@ type=Sorcery
 [/card]
 [card]
 text=Return target permanent you control to its owner's hand.
+id=15154
 target=*|myBattlefield
 auto=moveTo(myhand)
-id=15154
 name=Rescue
 rarity=C
 mana={U}
diff --git a/projects/mtg/bin/Res/sets/UDS/todo.dat b/projects/mtg/bin/Res/sets/UDS/todo.dat
index 69148c3f2..a3f8ad1ab 100644
--- a/projects/mtg/bin/Res/sets/UDS/todo.dat
+++ b/projects/mtg/bin/Res/sets/UDS/todo.dat
@@ -208,17 +208,6 @@ text={2}: Goblin Festival deals 1 damage to target creature or player. Flip a co
 rarity=R
 [/card]
 [card]
-id=15197
-name=Goblin Gardener
-mana={3}{R}
-type=Creature
-subtype=Goblin
-power=2
-toughness=1
-text=When Goblin Gardener is put into a graveyard from the battlefield, destroy target land.
-rarity=C
-[/card]
-[card]
 id=15212
 name=Goblin Marshal
 mana={4}{R}{R}
@@ -230,17 +219,6 @@ text=Echo {4}{R}{R} (At the beginning of your upkeep, if this came under your co
 rarity=R
 [/card]
 [card]
-id=15202
-name=Goblin Masons
-mana={1}{R}
-type=Creature
-subtype=Goblin
-power=2
-toughness=1
-text=When Goblin Masons is put into a graveyard from the battlefield, destroy target Wall.
-rarity=C
-[/card]
-[card]
 id=15219
 name=Hunting Moa
 mana={2}{G}
@@ -302,17 +280,6 @@ text={2}{W}, {T}: Reveal any number of white cards in your hand. You gain 2 life
 rarity=U
 [/card]
 [card]
-id=15256
-name=Junk Diver
-mana={3}
-type=Artifact Creature
-subtype=Bird
-power=1
-toughness=1
-text=Flying When Junk Diver is put into a graveyard from the battlefield, return another target artifact card from your graveyard to your hand.
-rarity=R
-[/card]
-[card]
 id=15206
 name=Keldon Champion
 mana={2}{R}{R}
@@ -360,17 +327,6 @@ text=Enchant creature Enchanted creature has haste. At the beginning of the end
 rarity=C
 [/card]
 [card]
-id=15222
-name=Marker Beetles
-mana={1}{G}{G}
-type=Creature
-subtype=Insect
-power=2
-toughness=3
-text=When Marker Beetles is put into a graveyard from the battlefield, target creature gets +1/+1 until end of turn. {2}, Sacrifice Marker Beetles: Draw a card.
-rarity=C
-[/card]
-[card]
 id=15874
 name=Master Healer
 mana={4}{W}
@@ -550,17 +506,6 @@ text=As an additional cost to cast Reckless Abandon, sacrifice a creature. Reckl
 rarity=C
 [/card]
 [card]
-id=15123
-name=Reliquary Monk
-mana={2}{W}
-type=Creature
-subtype=Human Monk Cleric
-power=2
-toughness=2
-text=When Reliquary Monk is put into a graveyard from the battlefield, destroy target artifact or enchantment.
-rarity=C
-[/card]
-[card]
 id=15216
 name=Repercussion
 mana={1}{R}{R}
diff --git a/projects/mtg/bin/Res/sets/ULG/_cards.dat b/projects/mtg/bin/Res/sets/ULG/_cards.dat
index 4038be5fb..22fc16267 100644
--- a/projects/mtg/bin/Res/sets/ULG/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ULG/_cards.dat
@@ -540,6 +540,19 @@ mana={2}{W}
 type=Instant
 [/card]
 [card]
+text=Enchant creature   Enchanted creature gets +2/+0 and has trample.   When Rancor is put into a graveyard from the battlefield, return Rancor to its owner's hand.
+auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(rancor|mygraveyard)
+id=12433
+target=creature
+auto=2/0
+auto=trample
+name=Rancor
+rarity=C
+mana={G}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 text=Return all artifacts to their owners' hands.   Cycling {2} ({2}, Discard this card: Draw a card.)
 id=12385
 auto=moveTo(ownerhand) all(artifact)
@@ -559,6 +572,20 @@ mana={3}
 type=Artifact
 [/card]
 [card]
+text=Flying   When Shivan Phoenix is put into a graveyard from the battlefield, return Shivan Phoenix to its owner's hand.
+auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(shivan phoenix|mygraveyard)
+
+id=12423
+name=Shivan Phoenix
+rarity=R
+mana={4}{R}{R}
+type=Creature
+subtype=Phoenix
+power=3
+toughness=4
+abilities=flying
+[/card]
+[card]
 text=Target creature gets +1/+1 and gains reach until end of turn. (It can block creatures with flying.)
 target=creature
 auto=1/1
@@ -570,6 +597,30 @@ mana={G}
 type=Instant
 [/card]
 [card]
+text=Enchant creature   Enchanted creature has fear. (It can't be blocked except by artifact creatures and/or black creatures.)   When Sleeper's Guile is put into a graveyard from the battlefield, return Sleeper's Guile to its owner's hand.
+auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(sleeper's guile|mygraveyard)
+id=12397
+target=creature
+auto=fear
+name=Sleeper's Guile
+rarity=C
+mana={2}{B}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
+text=Enchant creature   Enchanted creature can't block.   When Sluggishness is put into a graveyard from the battlefield, return Sluggishness to its owner's hand.
+auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(sluggishness|mygraveyard)
+id=12416
+target=creature
+auto=cantblock
+name=Sluggishness
+rarity=C
+mana={1}{R}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 text=At the beginning of your upkeep, each opponent loses 1 life. You gain life equal to the life lost this way.
 auto=@each my upkeep:life:1 controller
 auto=@each my upkeep:life:-1 opponent
@@ -704,6 +755,19 @@ toughness=1
 abilities=flying,protection from red
 [/card]
 [card]
+text=Trample   When Weatherseed Treefolk is put into a graveyard from the battlefield, return Weatherseed Treefolk to its owner's hand.
+auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(weatherseed treefolk|mygraveyard)
+id=12438
+name=Weatherseed Treefolk
+rarity=R
+mana={2}{G}{G}{G}
+type=Creature
+subtype=Treefolk
+power=5
+toughness=3
+abilities=trample
+[/card]
+[card]
 text=Destroy target creature with flying.
 target=creature[flying]
 auto=destroy
diff --git a/projects/mtg/bin/Res/sets/ULG/todo.dat b/projects/mtg/bin/Res/sets/ULG/todo.dat
index 4c8027e73..afb8b48a4 100644
--- a/projects/mtg/bin/Res/sets/ULG/todo.dat
+++ b/projects/mtg/bin/Res/sets/ULG/todo.dat
@@ -373,7 +373,6 @@ toughness=5
 text=Flying When Palinchron enters the battlefield, untap up to seven lands. {2}{U}{U}: Return Palinchron to its owner's hand.
 rarity=R
 [/card]
-
 [card]
 id=9709
 name=Peace and Quiet
@@ -426,15 +425,6 @@ text=Echo {3}{W} (At the beginning of your upkeep, if this came under your contr
 rarity=U
 [/card]
 [card]
-id=12433
-name=Rancor
-mana={G}
-type=Enchantment
-subtype=Aura
-text=Enchant creature Enchanted creature gets +2/+0 and has trample. When Rancor is put into a graveyard from the battlefield, return Rancor to its owner's hand.
-rarity=C
-[/card]
-[card]
 id=5703
 name=Rank and File
 mana={2}{B}{B}
@@ -489,17 +479,6 @@ text=At the beginning of your upkeep, if you have 5 or less life, sacrifice Seco
 rarity=R
 [/card]
 [card]
-id=12423
-name=Shivan Phoenix
-mana={4}{R}{R}
-type=Creature
-subtype=Phoenix
-power=3
-toughness=4
-text=Flying When Shivan Phoenix is put into a graveyard from the battlefield, return Shivan Phoenix to its owner's hand.
-rarity=R
-[/card]
-[card]
 id=9691
 name=Sick and Tired
 mana={2}{B}
@@ -519,15 +498,6 @@ text=Flash Echo {2}{G} (At the beginning of your upkeep, if this came under your
 rarity=C
 [/card]
 [card]
-id=12397
-name=Sleeper's Guile
-mana={2}{B}
-type=Enchantment
-subtype=Aura
-text=Enchant creature Enchanted creature has fear. (It can't be blocked except by artifact creatures and/or black creatures.) When Sleeper's Guile is put into a graveyard from the battlefield, return Sleeper's Guile to its owner's hand.
-rarity=C
-[/card]
-[card]
 id=12384
 name=Slow Motion
 mana={2}{U}
@@ -537,15 +507,6 @@ text=Enchant creature At the beginning of the upkeep of enchanted creature's con
 rarity=C
 [/card]
 [card]
-id=12416
-name=Sluggishness
-mana={1}{R}
-type=Enchantment
-subtype=Aura
-text=Enchant creature Enchanted creature can't block. When Sluggishness is put into a graveyard from the battlefield, return Sluggishness to its owner's hand.
-rarity=C
-[/card]
-[card]
 id=12374
 name=Snap
 mana={1}{U}
@@ -688,17 +649,6 @@ text={1}{R}, {T}: Destroy target artifact. Viashino Heretic deals damage to that
 rarity=U
 [/card]
 [card]
-id=12438
-name=Weatherseed Treefolk
-mana={2}{G}{G}{G}
-type=Creature
-subtype=Treefolk
-power=5
-toughness=3
-text=Trample When Weatherseed Treefolk is put into a graveyard from the battlefield, return Weatherseed Treefolk to its owner's hand.
-rarity=R
-[/card]
-[card]
 id=9706
 name=Wheel of Torture
 mana={3}
diff --git a/projects/mtg/bin/Res/sets/USG/_cards.dat b/projects/mtg/bin/Res/sets/USG/_cards.dat
index e554476a5..a03b926ee 100644
--- a/projects/mtg/bin/Res/sets/USG/_cards.dat
+++ b/projects/mtg/bin/Res/sets/USG/_cards.dat
@@ -569,6 +569,18 @@ mana={X}{R}{R}
 type=Instant
 [/card]
 [card]
+text=Enchant creature   When Fiery Mantle is put into a graveyard from the battlefield, return Fiery Mantle to its owner's hand.   {R}: Enchanted creature gets +1/+0 until end of turn.
+auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(fiery mantle|mygraveyard)
+id=10425
+target=creature
+auto={R}:1/0
+name=Fiery Mantle
+rarity=C
+mana={1}{R}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 text={T}: Fire Ants deals 1 damage to each other creature without flying.
 auto={T}:damage:1 all(creature[-flying]) other
 id=5568
@@ -631,20 +643,32 @@ type=Basic Land
 subtype=Forest
 [/card]
 [card]
+text=Enchant creature   When Fortitude is put into a graveyard from the battlefield, return Fortitude to its owner's hand.   Sacrifice a Forest: Regenerate enchanted creature.
+auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(fortitude|mygraveyard)
+id=9850
+target=creature
+auto={S(forest|myBattlefield)}:regenerate
+name=Fortitude
+rarity=C
+mana={1}{G}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 text={T}: Add {G} to your mana pool for each creature you control.
 id=10422
-auto={T}:foreach(creature|myBattlefield) add:{G}
 name=Gaea's Cradle
+auto={T}:foreach(creature|myBattlefield) add:{G}
 rarity=R
 type=Legendary Land
 [/card]
 [card]
 text=Enchant creature   Enchanted creature gets +3/+3 and has trample.   {G}: Regenerate enchanted creature.
+id=5720
 target=creature
 auto=3/3
 auto=trample
 auto={G}:regenerate
-id=5720
 name=Gaea's Embrace
 rarity=U
 mana={2}{G}{G}
@@ -653,10 +677,10 @@ subtype=Aura
 [/card]
 [card]
 text=Search your library for a card, put that card into your hand, then discard a card at random. Then shuffle your library.
+id=10654
 target=*|myLibrary
 auto=moveTo(myHand)
 auto=discard:1
-id=10654
 name=Gamble
 rarity=R
 type=Sorcery
@@ -784,7 +808,7 @@ type=Instant
 [card]
 text=Heat Ray deals X damage to target creature.
 target=creature
-alias=1291
+auto=damage:X
 id=10464
 name=Heat Ray
 rarity=C
@@ -895,6 +919,18 @@ type=Basic Land
 subtype=Island
 [/card]
 [card]
+text=Enchant creature   Enchanted creature has flying.   When Launch is put into a graveyard from the battlefield, return Launch to its owner's hand.
+auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(launch|mygraveyard)
+id=5832
+target=creature
+auto=flying
+name=Launch
+rarity=C
+mana={1}{U}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 text=Destroy target land.   Cycling {2} ({2}, Discard this card: Draw a card.)
 id=5817
 target=land
diff --git a/projects/mtg/bin/Res/sets/USG/todo.dat b/projects/mtg/bin/Res/sets/USG/todo.dat
index fdea8b7fc..9e79c1f78 100644
--- a/projects/mtg/bin/Res/sets/USG/todo.dat
+++ b/projects/mtg/bin/Res/sets/USG/todo.dat
@@ -457,15 +457,6 @@ mana={1}{G}
 subtype=Aura
 [/card]
 [card]
-text=Enchant creature     When Fiery Mantle is put into a graveyard from play, return Fiery Mantle to its owner's hand.     {R}: Enchanted creature gets +1/+0 until end of turn.
-id=10425
-name=Fiery Mantle
-rarity=C
-type=Enchantment
-mana={1}{R}
-subtype=Aura
-[/card]
-[card]
 text=Whenever Flesh Reaver deals damage to a creature or opponent, Flesh Reaver deals that much damage to you.
 id=5654
 name=Flesh Reaver
@@ -485,15 +476,6 @@ type=Artifact
 mana={2}
 [/card]
 [card]
-text=Enchant creature     When Fortitude is put into a graveyard from play, return Fortitude to its owner's hand.     Sacrifice a Forest: Regenerate enchanted creature.
-id=9850
-name=Fortitude
-rarity=C
-type=Enchantment
-mana={1}{G}
-subtype=Aura
-[/card]
-[card]
 text=Search your library for up to two Forest cards, reveal those cards, and put them into your hand. Then shuffle your library.
 id=5710
 name=Gaea's Bounty
@@ -695,15 +677,6 @@ subtype=Golem
 toughness=4
 [/card]
 [card]
-text=Enchant creature     Enchanted creature has flying.     When Launch is put into a graveyard from play, return Launch to its owner's hand.
-id=5832
-name=Launch
-rarity=C
-type=Enchantment
-mana={1}{U}
-subtype=Aura
-[/card]
-[card]
 text=Whenever a creature is put into a graveyard from play and another creature is in play, return the first creature from that graveyard to play under its owner's control at end of turn.
 id=8808
 name=Lifeline