diff --git a/projects/mtg/bin/Res/sets/EVE/_cards.dat b/projects/mtg/bin/Res/sets/EVE/_cards.dat
index 2e4045ae6..825a9fa9b 100644
--- a/projects/mtg/bin/Res/sets/EVE/_cards.dat
+++ b/projects/mtg/bin/Res/sets/EVE/_cards.dat
@@ -475,18 +475,6 @@ subtype=Spirit Avatar
 toughness=4
 [/card]
 [card]
-text=When Noggle Bridgebreaker comes into play, return a land you control to its owner's hand.
-id=158899
-name=Noggle Bridgebreaker
-auto=may moveTo(ownerhand) target(land|myinplay)
-rarity=C
-type=Creature
-mana={2}{UR}{UR}
-power=4
-subtype=Noggle Rogue
-toughness=3
-[/card]
-[card]
 text=When Noggle Ransacker comes into play, each player draws two cards, then discards a card at random.
 id=152032
 auto=draw:2 controller
diff --git a/projects/mtg/bin/Res/sets/EVE/todo.dat b/projects/mtg/bin/Res/sets/EVE/todo.dat
index 0e3779dab..f279b00fd 100644
--- a/projects/mtg/bin/Res/sets/EVE/todo.dat
+++ b/projects/mtg/bin/Res/sets/EVE/todo.dat
@@ -697,6 +697,18 @@ subtype=Noggle Rogue
 toughness=2
 [/card]
 [card]
+text=When Noggle Bridgebreaker comes into play, return a land you control to its owner's hand.
+id=158899
+name=Noggle Bridgebreaker
+auto=moveTo(ownerhand) target(land|myinplay)
+rarity=C
+type=Creature
+mana={2}{UR}{UR}
+power=4
+subtype=Noggle Rogue
+toughness=3
+[/card]
+[card]
 text=When Noggle Hedge-Mage comes into play, if you control two or more Islands, you may tap two target permanents.     When Noggle Hedge-Mage comes into play, if you control two or more Mountains, you may have Noggle Hedge-Mage deal 2 damage to target player.
 id=159066
 name=Noggle Hedge-Mage
diff --git a/projects/mtg/bin/Res/sets/GPT/_cards.dat b/projects/mtg/bin/Res/sets/GPT/_cards.dat
index 067513f21..789e5d756 100644
--- a/projects/mtg/bin/Res/sets/GPT/_cards.dat
+++ b/projects/mtg/bin/Res/sets/GPT/_cards.dat
@@ -89,16 +89,6 @@ toughness=1
 abilities=flying,cantblock
 [/card]
 [card]
-text=({WB} can be paid with either White or Black.)   At the beginning of your upkeep, put target creature card in a graveyard onto the battlefield under your control.
-auto=@each my upkeep:may moveTo(myBattlefield) target(creature|graveyard)
-id=97193
-name=Debtors' Knell
-color=White,Black
-rarity=R
-mana={4}{BW}{BW}{BW}
-type=Enchantment
-[/card]
-[card]
 text=Douse in Gloom deals 2 damage to target creature and you gain 2 life.
 target=creature
 auto=Damage:2
diff --git a/projects/mtg/bin/Res/sets/GPT/todo.dat b/projects/mtg/bin/Res/sets/GPT/todo.dat
index ee3a59c97..263342fad 100644
--- a/projects/mtg/bin/Res/sets/GPT/todo.dat
+++ b/projects/mtg/bin/Res/sets/GPT/todo.dat
@@ -253,12 +253,14 @@ text=Flying Daggerclaw Imp can't block.
 rarity=U
 [/card]
 [card]
+text=({WB} can be paid with either White or Black.)   At the beginning of your upkeep, put target creature card in a graveyard onto the battlefield under your control.
+auto=@each my upkeep:moveTo(myBattlefield) target(creature|graveyard)
 id=97193
 name=Debtors' Knell
-mana={4}{(}{W}{/}{B}{)}{(}{W}{/}{B}{)}{(}{W}{/}{B}{)}
-type=Enchantment
-text=({(w/b)} can be paid with either {W} or {B}.) At the beginning of your upkeep, put target creature card in a graveyard onto the battlefield under your control.
+color=White,Black
 rarity=R
+mana={4}{BW}{BW}{BW}
+type=Enchantment
 [/card]
 [card]
 id=97197
diff --git a/projects/mtg/bin/Res/sets/INV/_cards.dat b/projects/mtg/bin/Res/sets/INV/_cards.dat
index b72c60176..33ef822a6 100644
--- a/projects/mtg/bin/Res/sets/INV/_cards.dat
+++ b/projects/mtg/bin/Res/sets/INV/_cards.dat
@@ -321,19 +321,6 @@ toughness=2
 abilities=protection from black
 [/card]
 [card]
-text=Flying, protection from white     When Crypt Angel comes into play, return target blue or red creature card from your graveyard to your hand.
-id=23320
-name=Crypt Angel
-auto=may moveTo(myhand) target(creature[blue;red]|mygraveyard)
-rarity=R
-type=Creature
-mana={4}{B}
-power=3
-subtype=Angel
-toughness=3
-abilities=flying
-[/card]
-[card]
 text=Enchant creature   Enchanted creature gets -1/-1 and has fear.
 target=creature
 auto=-1/-1
diff --git a/projects/mtg/bin/Res/sets/INV/todo.dat b/projects/mtg/bin/Res/sets/INV/todo.dat
index 91e9d18fe..2037d8d47 100644
--- a/projects/mtg/bin/Res/sets/INV/todo.dat
+++ b/projects/mtg/bin/Res/sets/INV/todo.dat
@@ -314,6 +314,19 @@ mana={R}
 subtype=Aura
 [/card]
 [card]
+text=Flying, protection from white     When Crypt Angel comes into play, return target blue or red creature card from your graveyard to your hand.
+id=23320
+name=Crypt Angel
+auto=moveTo(myhand) target(creature[blue;red]|mygraveyard)
+rarity=R
+type=Creature
+mana={4}{B}
+power=3
+subtype=Angel
+toughness=3
+abilities=flying,protection from white 
+[/card]
+[card]
 text=Change the text of target spell or permanent by replacing all instances of one color word or basic land type with another until end of turn.       Draw a card.
 id=23008
 name=Crystal Spray
diff --git a/projects/mtg/bin/Res/sets/MRD/_cards.dat b/projects/mtg/bin/Res/sets/MRD/_cards.dat
index 61c8969b0..a393320ee 100644
--- a/projects/mtg/bin/Res/sets/MRD/_cards.dat
+++ b/projects/mtg/bin/Res/sets/MRD/_cards.dat
@@ -627,19 +627,6 @@ power=10
 toughness=10
 [/card]
 [card]
-text=Flying   When Looming Hoverguard enters the battlefield, put target artifact on top of its owner's library.
-auto=may moveTo(ownerLibrary) target(artifact)
-id=48114
-name=Looming Hoverguard
-rarity=U
-mana={4}{U}{U}
-type=Creature
-subtype=Drone
-power=3
-toughness=3
-abilities=flying
-[/card]
-[card]
 text={W}, {T}: Regenerate target artifact.
 auto={W}{T}:regenerate target(artifact)
 id=46071
diff --git a/projects/mtg/bin/Res/sets/MRD/todo.dat b/projects/mtg/bin/Res/sets/MRD/todo.dat
index 5ec504900..ab84ef042 100644
--- a/projects/mtg/bin/Res/sets/MRD/todo.dat
+++ b/projects/mtg/bin/Res/sets/MRD/todo.dat
@@ -679,7 +679,19 @@ power=2
 subtype=Myr
 toughness=2
 [/card]
-
+[card]
+text=Flying   When Looming Hoverguard enters the battlefield, put target artifact on top of its owner's library.
+auto=moveTo(ownerLibrary) target(artifact)
+id=48114
+name=Looming Hoverguard
+rarity=U
+mana={4}{U}{U}
+type=Creature
+subtype=Drone
+power=3
+toughness=3
+abilities=flying
+[/card]
 [card]
 text=At the beginning of your upkeep, the player with the lowest life total gains control of Loxodon Peacekeeper. If two or more players are tied for lowest life total, you choose one of them, and that player gains control of Loxodon Peacekeeper.
 id=48180
diff --git a/projects/mtg/bin/Res/sets/ODY/_cards.dat b/projects/mtg/bin/Res/sets/ODY/_cards.dat
index 68cd6d478..c501f1995 100644
--- a/projects/mtg/bin/Res/sets/ODY/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ODY/_cards.dat
@@ -101,8 +101,9 @@ rarity=U
 text=Flying (This creature can't be blocked except by creatures with flying or reach.)   When Aven Cloudchaser comes into play, destroy target enchantment.
 id=29694
 name=Aven Cloudchaser
+target=enchantment
 abilities=flying
-auto=may moveTo(ownergraveyard) target(enchantment)
+auto=destroy
 rarity=C
 type=Creature
 mana={3}{W}
diff --git a/projects/mtg/bin/Res/sets/ONS/todo.dat b/projects/mtg/bin/Res/sets/ONS/todo.dat
index c06601df8..ede290570 100644
--- a/projects/mtg/bin/Res/sets/ONS/todo.dat
+++ b/projects/mtg/bin/Res/sets/ONS/todo.dat
@@ -98,8 +98,9 @@ type=Creature
 subtype=Zombie Bird
 power=3
 toughness=2
-text=Flying When Aphetto Vulture is put into a graveyard from play, you may put target Zombie card from your graveyard on top of your library.
-auto=@movedTo(this|graveyard):may moveto(mylibrary) target(zombie|mygraveyard)
+text=Flying. When Aphetto Vulture is put into a graveyard from play, you may put target Zombie card from your graveyard on top of your library.
+auto=@movedTo(this|graveyard) from(inplay):may moveto(mylibrary) target(zombie|mygraveyard) ##don't understand why this doesnt work...
+abilities=flying
 rarity=U
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/sets/TMP/_cards.dat b/projects/mtg/bin/Res/sets/TMP/_cards.dat
index 926e00e22..624e7cfd2 100644
--- a/projects/mtg/bin/Res/sets/TMP/_cards.dat
+++ b/projects/mtg/bin/Res/sets/TMP/_cards.dat
@@ -271,6 +271,20 @@ power=1
 toughness=1
 [/card]
 [card]
+text=Flying     When Cloudchaser Eagle comes into play, destroy target enchantment.
+abilities=flying
+id=4871
+name=Cloudchaser Eagle
+target=enchantment
+auto=destroy 
+rarity=C
+type=Creature
+mana={3}{W}
+power=2
+subtype=Bird
+toughness=2
+[/card]
+[card]
 text=First strike
 id=4599
 name=Coiled Tinviper
diff --git a/projects/mtg/bin/Res/sets/TMP/todo.dat b/projects/mtg/bin/Res/sets/TMP/todo.dat
index 8e2de7b14..14671e474 100644
--- a/projects/mtg/bin/Res/sets/TMP/todo.dat
+++ b/projects/mtg/bin/Res/sets/TMP/todo.dat
@@ -176,19 +176,7 @@ power=1
 subtype=Human Cleric
 toughness=1
 [/card]
-[card]
-text=Flying     When Cloudchaser Eagle comes into play, destroy target enchantment.
-abilities=flying
-id=4871
-name=Cloudchaser Eagle
-auto=may moveto(ownergraveyard) target(enchantment)
-rarity=C
-type=Creature
-mana={3}{W}
-power=2
-subtype=Bird
-toughness=2
-[/card]
+
 [card]
 text=Target opponent reveals his or her hand. Choose a card from it. That player discards that card.
 id=4641
diff --git a/projects/mtg/bin/Res/sets/USG/_cards.dat b/projects/mtg/bin/Res/sets/USG/_cards.dat
index 2865f4c8f..91c9d5691 100644
--- a/projects/mtg/bin/Res/sets/USG/_cards.dat
+++ b/projects/mtg/bin/Res/sets/USG/_cards.dat
@@ -337,6 +337,21 @@ mana={2}{G}
 type=Enchantment
 [/card]
 [card]
+text=Flying. When Dark Hatchling comes into play, destroy target nonblack creature. It can't be regenerated.
+target=creature[-black]
+auto=bury
+id=5852
+name=Dark Hatchling
+color=Black
+rarity=R
+mana={4}{B}{B}
+type=Creature
+subtype=Horror
+power=3
+toughness=3
+abilities=flying
+[/card]
+[card]
 text=Add {B}{B}{B} to your mana pool.
 auto=Add {B}{B}{B}
 id=5626
@@ -731,18 +746,6 @@ toughness=6
 abilities=defender
 [/card]
 [card]
-text=When Monk Idealist comes into play, return target enchantment card from your graveyard to your hand.
-auto=may moveTo(myhand) target(enchantment|mygraveyard)
-id=5706
-name=Monk Idealist
-rarity=U
-mana={2}{W}
-type=Creature
-subtype=Human Monk Cleric
-power=2
-toughness=2
-[/card]
-[card]
 text={U}: Untap Morphling.   {U}: Morphling gains flying until end of turn.   {U}: Morphling gains shroud until end of turn. (It can't be the target of spells or abilities.)   {1}: Morphling gets +1/-1 until end of turn.   {1}: Morphling gets -1/+1 until end of turn.
 id=5863
 name=Morphling
@@ -1117,18 +1120,6 @@ type=Sorcery
 mana={2}{R}
 [/card]
 [card]
-text=When Stern Proctor enters the battlefield, return target artifact or enchantment to its owner's hand.
-auto=may moveTo(ownerhand) target(enchantment,artifact)
-id=5661
-name=Stern Proctor
-rarity=U
-mana={U}{U}
-type=Creature
-subtype=Human Wizard
-power=1
-toughness=2
-[/card]
-[card]
 text=Target player draws X cards.
 target=player
 alias=1192
diff --git a/projects/mtg/bin/Res/sets/USG/todo.dat b/projects/mtg/bin/Res/sets/USG/todo.dat
index 612208dff..0dcd1a0e7 100644
--- a/projects/mtg/bin/Res/sets/USG/todo.dat
+++ b/projects/mtg/bin/Res/sets/USG/todo.dat
@@ -311,20 +311,7 @@ rarity=C
 type=Instant
 mana={U}
 [/card]
-[card]
-text=Flying         When Dark Hatchling comes into play, destroy target nonblack creature. It can't be regenerated.
-auto=may moveto(ownergraveyard) target(creature[-black])
-id=5852
-name=Dark Hatchling
-color=Black
-rarity=R
-mana={4}{B}{B}
-type=Creature
-subtype=Horror
-power=3
-toughness=3
-abilities=flying
-[/card]
+
 [card]
 text=All creatures are black.
 id=5622
@@ -973,7 +960,18 @@ rarity=R
 type=Artifact
 mana={5}
 [/card]
-
+[card]
+text=When Monk Idealist comes into play, return target enchantment card from your graveyard to your hand.
+auto=moveTo(myhand) target(enchantment|mygraveyard)
+id=5706
+name=Monk Idealist
+rarity=U
+mana={2}{W}
+type=Creature
+subtype=Human Monk Cleric
+power=2
+toughness=2
+[/card]
 [card]
 text=When Monk Realist comes into play, destroy target enchantment.
 auto=may destroy target(enchantment)
@@ -1668,6 +1666,18 @@ mana={G}
 subtype=Aura
 [/card]
 [card]
+text=When Stern Proctor enters the battlefield, return target artifact or enchantment to its owner's hand.
+auto=moveTo(ownerhand) target(enchantment,artifact)
+id=5661
+name=Stern Proctor
+rarity=U
+mana={U}{U}
+type=Creature
+subtype=Human Wizard
+power=1
+toughness=2
+[/card]
+[card]
 text=If a red spell would deal damage to a creature or player, it deals that much damage plus 1 to that creature or player instead.
 id=5638
 name=Sulfuric Vapors