diff --git a/projects/mtg/bin/Res/sets/10E/todo.dat b/projects/mtg/bin/Res/sets/10E/todo.dat
index ab1e2e551..df7a41532 100644
--- a/projects/mtg/bin/Res/sets/10E/todo.dat
+++ b/projects/mtg/bin/Res/sets/10E/todo.dat
@@ -72,6 +72,7 @@ toughness=8
 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=129470
 name=Aven Cloudchaser
+auto=destroy target(enchantment)
 rarity=C
 color=White
 type=Creature
diff --git a/projects/mtg/bin/Res/sets/ARB/_cards.dat b/projects/mtg/bin/Res/sets/ARB/_cards.dat
index a960b29ca..710046f08 100644
--- a/projects/mtg/bin/Res/sets/ARB/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ARB/_cards.dat
@@ -387,18 +387,6 @@ auto={T}:Untap target(*)
 type=Artifact
 [/card]
 [card]
-text=When Vithian Renegades comes into play, destroy target artifact.
-id=179535
-auto=may moveTo(graveyard) target(artifact)
-name=Vithian Renegades
-rarity=U
-mana={1}{R}{G}
-type=Creature
-subtype=Human Shaman
-power=3
-toughness=2
-[/card]
-[card]
 text=Defender, flying, shroud
 id=179601
 name=Wall of Denial
@@ -419,4 +407,4 @@ text=Until end of turn, creatures you control get +1/+1 and creatures your oppon
 auto=lord(creature|myinplay) 1/1
 auto=lord(creature|opponentinplay) -1/-1
 rarity=U
-[/card]
+[/card]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/sets/ARB/todo.dat b/projects/mtg/bin/Res/sets/ARB/todo.dat
index 53f2f9e39..346bd682a 100644
--- a/projects/mtg/bin/Res/sets/ARB/todo.dat
+++ b/projects/mtg/bin/Res/sets/ARB/todo.dat
@@ -1065,6 +1065,18 @@ text=Cascade (When you play this spell, remove cards from the top of your librar
 rarity=C
 [/card]
 [card]
+text=When Vithian Renegades comes into play, destroy target artifact.
+id=179535
+auto=destroy target(artifact)
+name=Vithian Renegades
+rarity=U
+mana={1}{R}{G}
+type=Creature
+subtype=Human Shaman
+power=3
+toughness=2
+[/card]
+[card]
 id=180592
 name=Wargate
 mana={X}{G}{W}{U}
diff --git a/projects/mtg/bin/Res/sets/EVE/_cards.dat b/projects/mtg/bin/Res/sets/EVE/_cards.dat
index aff8ab548..ab8c2c6a9 100644
--- a/projects/mtg/bin/Res/sets/EVE/_cards.dat
+++ b/projects/mtg/bin/Res/sets/EVE/_cards.dat
@@ -396,18 +396,6 @@ subtype=Bird
 toughness=3
 [/card]
 [card]
-text=When Marshdrinker Giant comes into play, destroy target Island or Swamp an opponent controls.
-auto=destroy target(island,swamp|opponentinplay)
-id=142015
-name=Marshdrinker Giant
-rarity=U
-type=Creature
-mana={3}{G}{G}
-power=4
-subtype=Giant Warrior
-toughness=3
-[/card]
-[card]
 text={T}: Target creature gains flying until end of turn.     Whenever you play a blue spell, you may untap Merrow Levitator.
 auto={T}:flying target(creature)
 auto=@movedTo(*[blue]|mystack):may untap
diff --git a/projects/mtg/bin/Res/sets/EVE/todo.dat b/projects/mtg/bin/Res/sets/EVE/todo.dat
index 3207bee47..0e3779dab 100644
--- a/projects/mtg/bin/Res/sets/EVE/todo.dat
+++ b/projects/mtg/bin/Res/sets/EVE/todo.dat
@@ -592,6 +592,18 @@ type=Enchantment
 mana={2}{W}{W}
 [/card]
 [card]
+text=When Marshdrinker Giant comes into play, destroy target Island or Swamp an opponent controls.
+auto=destroy target(island,swamp|opponentinplay)
+id=142015
+name=Marshdrinker Giant
+rarity=U
+type=Creature
+mana={3}{G}{G}
+power=4
+subtype=Giant Warrior
+toughness=3
+[/card]
+[card]
 text={T}: Target player removes a card in his or her graveyard from the game.      Whenever you play a black spell, you may untap Merrow Bonegnawer.
 id=151158
 name=Merrow Bonegnawer
diff --git a/projects/mtg/bin/Res/sets/EXO/_cards.dat b/projects/mtg/bin/Res/sets/EXO/_cards.dat
index c4c8eb1d2..d15dc30f1 100644
--- a/projects/mtg/bin/Res/sets/EXO/_cards.dat
+++ b/projects/mtg/bin/Res/sets/EXO/_cards.dat
@@ -364,18 +364,6 @@ toughness=1
 abilities=haste
 [/card]
 [card]
-text=When Ravenous Baboons comes into play, destroy target nonbasic land.
-id=5207
-name=Ravenous Baboons
-rarity=R
-mana={3}{R}
-type=Creature
-subtype=Ape
-auto=may destroy target(land[-basic])
-power=2
-toughness=2
-[/card]
-[card]
 text=Put target card from your graveyard on top of your library.
 target=*|mygraveyard
 auto=moveTo(myLibrary)
diff --git a/projects/mtg/bin/Res/sets/EXO/todo.dat b/projects/mtg/bin/Res/sets/EXO/todo.dat
index c475e2571..285ce48c7 100644
--- a/projects/mtg/bin/Res/sets/EXO/todo.dat
+++ b/projects/mtg/bin/Res/sets/EXO/todo.dat
@@ -532,6 +532,18 @@ text={X}{X}{B}: Destroy target nonblack creature with converted mana cost X.
 rarity=R
 [/card]
 [card]
+text=When Ravenous Baboons comes into play, destroy target nonbasic land.
+id=5207
+name=Ravenous Baboons
+rarity=R
+mana={3}{R}
+type=Creature
+subtype=Ape
+auto=destroy target(land[-basic])
+power=2
+toughness=2
+[/card]
+[card]
 id=6037
 name=Reaping the Rewards
 mana={W}
diff --git a/projects/mtg/bin/Res/sets/TSP/_cards.dat b/projects/mtg/bin/Res/sets/TSP/_cards.dat
index dc31d3571..5445b870c 100644
--- a/projects/mtg/bin/Res/sets/TSP/_cards.dat
+++ b/projects/mtg/bin/Res/sets/TSP/_cards.dat
@@ -700,19 +700,6 @@ auto={T}{S}:moveTo(myinplay) target(basic|mylibrary) && tap
 rarity=C
 [/card]
 [card]
-id=116736
-name=Tivadar of Thorn
-mana={1}{W}{W}
-type=Creature
-subtype=Human Knight
-power=2
-toughness=2
-text=First strike, protection from red When Tivadar of Thorn comes into play, destroy target Goblin.
-abilities=first strike, protection from red, legendary
-auto=destroy target(goblin)
-rarity=R
-[/card]
-[card]
 id=108907
 name=Tolarian Sentinel
 mana={3}{U}
diff --git a/projects/mtg/bin/Res/sets/TSP/todo.dat b/projects/mtg/bin/Res/sets/TSP/todo.dat
index f3cfe29a2..da7748921 100644
--- a/projects/mtg/bin/Res/sets/TSP/todo.dat
+++ b/projects/mtg/bin/Res/sets/TSP/todo.dat
@@ -2012,6 +2012,19 @@ text={T}: Add {W} to your mana pool. {1}{W}{W}: Thunder Totem becomes a 2/2 whit
 rarity=U
 [/card]
 [card]
+id=116736
+name=Tivadar of Thorn
+mana={1}{W}{W}
+type=Creature
+subtype=Human Knight
+power=2
+toughness=2
+text=First strike, protection from red When Tivadar of Thorn comes into play, destroy target Goblin.
+abilities=first strike, protection from red, legendary
+auto=destroy target(goblin)
+rarity=R
+[/card]
+[card]
 id=108857
 name=Traitor's Clutch
 mana={4}{B}