diff --git a/projects/mtg/bin/Res/sets/ALA/_cards.dat b/projects/mtg/bin/Res/sets/ALA/_cards.dat
index 73cda9170..a4d2b98b1 100644
--- a/projects/mtg/bin/Res/sets/ALA/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ALA/_cards.dat
@@ -496,6 +496,18 @@ toughness=4
 abilities=defender,exalted
 [/card]
 [card]
+text=Choose one - Remove target player's graveyard from the game; or Jund Charm deals 2 damage to each creature; or put two +1/+1 counters on target creature.
+id=137900
+name=Jund Charm
+auto=may moveTo(exile) all(*|opponentgraveyard)
+auto=may moveTo(exile) all(*|mygraveyard)
+auto=may damage:2 all(creature)
+auto=may counter(1/1,2) target(creature)
+rarity=U
+mana={B}{R}{G}
+type=Instant
+[/card]
+[card]
 text=Flying, trample, haste   {R}: Hellkite Overlord gets +1/+0 until end of turn.   {B}{G}: Regenerate Hellkite Overlord.
 id=175057
 name=Hellkite Overlord
@@ -782,6 +794,17 @@ power=2
 toughness=2
 [/card]
 [card]
+text=Choose one - Naya Charm deals 3 damage to target creature; or return target card in a graveyard to its owner's hand; or tap all creatures target player controls.
+id=137905
+name=Naya Charm
+auto=may damage:3 target(creature)
+auto=may moveTo(ownerhand) target(*|graveyard)
+auto=may tap all(creature|opponentBattlefield)
+rarity=U
+mana={R}{G}{W}
+type=Instant
+[/card]
+[card]
 text={T}: Add {1} to your mana pool.   {1}, {T}, Sacrifice Naya Panorama: Search your library for a basic Mountain, Forest, or Plains card and put it onto the battlefield tapped. Then shuffle your library.
 auto={T}:Add{1}
 auto={1}{T}{S}:moveTo(myBattlefield) target(mountain,forest,plains|mylibrary) && tap
diff --git a/projects/mtg/bin/Res/sets/ALA/todo.dat b/projects/mtg/bin/Res/sets/ALA/todo.dat
index 6c3e71587..67aca1903 100644
--- a/projects/mtg/bin/Res/sets/ALA/todo.dat
+++ b/projects/mtg/bin/Res/sets/ALA/todo.dat
@@ -520,14 +520,6 @@ type=Sorcery
 mana={6}{W}{W}
 [/card]
 
-[card]
-text=Choose one - Remove target player's graveyard from the game; or Jund Charm deals 2 damage to each creature; or put two +1/+1 counters on target creature.
-id=137900
-name=Jund Charm
-rarity=U
-type=Instant
-mana={B}{R}{G}
-[/card]
 [card]
 text=Reach (This can block creatures with flying.)  Cycling {2} ({2}, Discard this card: Draw a card.)
 id=175262
@@ -700,16 +692,6 @@ subtype=Fungus
 toughness=4
 [/card]
 
-[card]
-text=Choose one - Naya Charm deals 3 damage to target creature; or return target card in a graveyard to its owner's hand; or tap all creatures target player controls.
-id=137905
-name=Naya Charm
-rarity=U
-type=Instant
-mana={R}{G}{W}
-[/card]
-
-
 [card]
 text=When Oblivion Ring comes into play, remove another target nonland permanent from the game.      When Oblivion Ring leaves play, return the removed card to play under its owner's control.
 id=174909
diff --git a/projects/mtg/bin/Res/sets/PLS/_cards.dat b/projects/mtg/bin/Res/sets/PLS/_cards.dat
index dca81d255..ee6a84783 100644
--- a/projects/mtg/bin/Res/sets/PLS/_cards.dat
+++ b/projects/mtg/bin/Res/sets/PLS/_cards.dat
@@ -47,6 +47,28 @@ mana={1}{W}
 type=Instant
 [/card]
 [card]
+text=Choose one - Return target permanent to its owner's hand; or destroy target nonblack creature, and it can't be regenerated; or destroy target artifact.
+id=25863
+name=Crosis's Charm
+auto=may moveTo(ownerhand) target(*)
+auto=may bury target(creature[black])
+auto=may destroy target(artifact)
+rarity=U
+mana={U}{B}{R}
+type=Instant
+[/card]
+[card]
+text=Choose one - Return target creature card from your graveyard to your hand; or Darigaaz's Charm deals 3 damage to target creature or player; or target creature gets +3/+3 until end of turn.
+id=25864
+name=Darigaaz's Charm
+auto=may moveTo(myhand) target(creature|mygraveyard)
+auto=may damage:3 target(creature,player)
+auto=may 3/3 target(creature)
+rarity=U
+mana={B}{R}{G}
+type=Instant
+[/card]
+[card]
 text=Target creature gets +1/+1 and gains flying and first strike until end of turn.
 target=creature
 auto=1/1
@@ -81,6 +103,17 @@ mana={2}{W}
 type=Instant
 [/card]
 [card]
+text=Choose one - You gain 5 life; or counter target spell; or target creature gets -2/-2 until end of turn.
+id=25862
+name=Dromar's Charm
+auto=may life:5 controller
+auto=may fizzle target(*|stack)
+auto=may -2/-2 target(creature)
+rarity=U
+mana={W}{U}{B}
+type=Instant
+[/card]
+[card]
 text=Search your library for a creature card, reveal it, and put it into your hand. Then shuffle your library.
 target=creature|mylibrary
 auto=moveTo(myHand)
diff --git a/projects/mtg/bin/Res/sets/PLS/todo.dat b/projects/mtg/bin/Res/sets/PLS/todo.dat
index 518491bfc..bb9c9975a 100644
--- a/projects/mtg/bin/Res/sets/PLS/todo.dat
+++ b/projects/mtg/bin/Res/sets/PLS/todo.dat
@@ -76,14 +76,6 @@ text=When Crosis's Catacombs enters the battlefield, sacrifice it unless you ret
 rarity=U
 [/card]
 [card]
-id=25863
-name=Crosis's Charm
-mana={U}{B}{R}
-type=Instant
-text=Choose one  EReturn target permanent to its owner's hand; or destroy target nonblack creature, and it can't be regenerated; or destroy target artifact.
-rarity=U
-[/card]
-[card]
 id=25938
 name=Darigaaz's Caldera
 mana=
@@ -93,14 +85,6 @@ text=When Darigaaz's Caldera enters the battlefield, sacrifice it unless you ret
 rarity=U
 [/card]
 [card]
-id=25864
-name=Darigaaz's Charm
-mana={B}{R}{G}
-type=Instant
-text=Choose one  EReturn target creature card from your graveyard to your hand; or Darigaaz's Charm deals 3 damage to target creature or player; or target creature gets +3/+3 until end of turn.
-rarity=U
-[/card]
-[card]
 id=26414
 name=Dark Suspicions
 mana={2}{B}{B}
@@ -194,14 +178,6 @@ text=When Dromar's Cavern enters the battlefield, sacrifice it unless you return
 rarity=U
 [/card]
 [card]
-id=25862
-name=Dromar's Charm
-mana={W}{U}{B}
-type=Instant
-text=Choose one  EYou gain 5 life; or counter target spell; or target creature gets -2/-2 until end of turn.
-rarity=U
-[/card]
-[card]
 id=26590
 name=Ertai's Trickery
 mana={U}
@@ -372,17 +348,6 @@ text=Kicker—Sacrifice two lands. (You may sacrifice two lands in addition to a
 rarity=C
 [/card]
 [card]
-id=26397
-name=Magnigoth Treefolk
-mana={4}{G}
-type=Creature
-subtype=Treefolk
-power=2
-toughness=6
-text=Domain  EFor each basic land type among lands you control, Magnigoth Treefolk has landwalk of that type.
-rarity=R
-[/card]
-[card]
 id=25870
 name=Malicious Advice
 mana={X}{U}{B}
@@ -636,12 +601,15 @@ text=When Razing Snidd enters the battlefield, return a black or red creature yo
 rarity=U
 [/card]
 [card]
+####NOT 100% CODABLE YET!!
+text=Choose one - Destroy target nonbasic land; or put three 1/1 green Saproling creature tokens onto the battlefield; or prevent all damage a source of your choice would deal this turn.
 id=25865
 name=Rith's Charm
+auto=may destroy target(land[-basic])
+auto=may token(Saproling,creature saproling,1/1,green)*3
+rarity=U
 mana={R}{G}{W}
 type=Instant
-text=Choose one  EDestroy target nonbasic land; or put three 1/1 green Saproling creature tokens onto the battlefield; or prevent all damage a source of your choice would deal this turn.
-rarity=U
 [/card]
 [card]
 id=25939
diff --git a/projects/mtg/bin/Res/sets/USG/_cards.dat b/projects/mtg/bin/Res/sets/USG/_cards.dat
index f234ef4d1..5b24acb6f 100644
--- a/projects/mtg/bin/Res/sets/USG/_cards.dat
+++ b/projects/mtg/bin/Res/sets/USG/_cards.dat
@@ -207,6 +207,16 @@ toughness=3
 abilities=islandwalk
 [/card]
 [card]
+text=Destroy all lands or all creatures. Creatures destroyed this way can't be regenerated.
+id=5637
+name=Catastrophe
+auto=may bury all(creature)
+auto=may destroy all(land)
+rarity=R
+mana={4}{W}{W}
+type=Sorcery
+[/card]
+[card]
 text=When Cathodion is put into a graveyard from the battlefield, add {3} to your mana pool.
 auto=@movedTo(this|graveyard) from(battlefield):Add{3}
 id=10659
diff --git a/projects/mtg/bin/Res/sets/USG/todo.dat b/projects/mtg/bin/Res/sets/USG/todo.dat
index ced671f3e..49d9f80d0 100644
--- a/projects/mtg/bin/Res/sets/USG/todo.dat
+++ b/projects/mtg/bin/Res/sets/USG/todo.dat
@@ -208,15 +208,6 @@ rarity=C
 type=Instant
 mana={2}{U}
 [/card]
-[card]
-text=Destroy all lands or all creatures. Creatures destroyed this way can't be regenerated.
-id=5637
-name=Catastrophe
-rarity=R
-type=Sorcery
-mana={4}{W}{W}
-[/card]
-
 [card]
 text=Trample     At the beginning of your upkeep, sacrifice Child of Gaea unless you pay {G}{G}.     {1}{G}: Regenerate Child of Gaea.
 id=9678