diff --git a/projects/mtg/bin/Res/sets/mtg_todo.dat b/projects/mtg/bin/Res/sets/mtg_todo.dat
index 179603e48..beb4fd026 100644
--- a/projects/mtg/bin/Res/sets/mtg_todo.dat
+++ b/projects/mtg/bin/Res/sets/mtg_todo.dat
@@ -17727,12 +17727,6 @@ text=You may choose not to untap Ice Floe during your untap step. -- {T}: Tap ta
 type=Land
 [/card]
 [card]
-name=Iceberg
-text=Iceberg enters the battlefield with X ice counters on it. -- {3}: Put an ice counter on Iceberg. -- Remove an ice counter from Iceberg: Add {1} to your mana pool.
-mana={X}{U}{U}
-type=Enchantment
-[/card]
-[card]
 name=Icefall
 text=Destroy target artifact or land. -- Recover {R}{R} (When a creature is put into your graveyard from the battlefield, you may pay {R}{R}. If you do, return this card from your graveyard to your hand. Otherwise, exile this card.)
 mana={2}{R}{R}
@@ -18761,15 +18755,6 @@ mana={2}{W}{W}
 type=Enchantment
 [/card]
 [card]
-name=Ivy Elemental
-text=Ivy Elemental enters the battlefield with X +1/+1 counters on it.
-mana={X}{G}
-type=Creature
-subtype=Elemental
-power=0
-toughness=0
-[/card]
-[card]
 name=Ivy Seer
 text={2}{G}, {T}: Reveal any number of green cards in your hand. Target creature gets +X/+X until end of turn, where X is the number of cards revealed this way.
 mana={3}{G}
@@ -20329,15 +20314,6 @@ mana={2}{B}{B}
 type=World Enchantment
 [/card]
 [card]
-name=Krakilin
-text=Krakilin enters the battlefield with X +1/+1 counters on it. -- {1}{G}: Regenerate Krakilin.
-mana={X}{G}{G}
-type=Creature
-subtype=Beast
-power=0
-toughness=0
-[/card]
-[card]
 name=Krark's Thumb
 text=If you would flip a coin, instead flip two coins and ignore one.
 mana={2}
@@ -21387,18 +21363,6 @@ mana={1}{R}
 type=Enchantment
 [/card]
 [card]
-name=Lightning Serpent
-abilities=trample,haste
-auto=counter(1/0,x)
-auto=@next end:bury
-text=Trample, haste -- Lightning Serpent enters the battlefield with X +1/+0 counters on it. -- At the beginning of the end step, sacrifice Lightning Serpent.
-mana={X}{R}
-type=Creature
-subtype=Elemental Serpent
-power=2
-toughness=1
-[/card]
-[card]
 name=Lightning Storm
 text=Lightning Storm deals X damage to target creature or player, where X is 3 plus the number of charge counters on it. -- Discard a land card: Put two charge counters on Lightning Storm. You may choose a new target for it. Any player may activate this ability but only if Lightning Storm is on the stack.
 mana={1}{R}{R}
@@ -22163,15 +22127,6 @@ mana={1}{B}{G}
 type=Sorcery
 [/card]
 [card]
-name=Maga, Traitor to Mortals
-text=Maga, Traitor to Mortals enters the battlefield with X +1/+1 counters on it. -- When Maga enters the battlefield, target player loses life equal to the number of +1/+1 counters on it.
-mana={X}{B}{B}{B}
-type=Legendary Creature
-subtype=Human Wizard
-power=0
-toughness=0
-[/card]
-[card]
 name=Mage Slayer
 text=Whenever equipped creature attacks, it deals damage equal to its power to defending player. -- Equip {3}
 mana={1}{R}{G}
@@ -34325,15 +34280,6 @@ mana={2}{U}
 type=Enchantment
 [/card]
 [card]
-name=Shifting Wall
-text=Defender (This creature can't attack.) -- Shifting Wall enters the battlefield with X +1/+1 counters on it.
-mana={X}
-type=Artifact Creature
-subtype=Wall
-power=0
-toughness=0
-[/card]
-[card]
 name=Shifty Doppelganger
 text={3}{U}, Exile Shifty Doppelganger: You may put a creature card from your hand onto the battlefield. If you do, that creature gains haste until end of turn. At the beginning of the next end step, sacrifice that creature. If you do, return Shifty Doppelganger to the battlefield.
 mana={2}{U}
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 69686467a..561e3b075 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -13318,27 +13318,29 @@ subtype=Faerie Soldier
 power=3
 toughness=2
 [/card]
+
 [card]
-name=Feral Hydra
-type=Creature
-subtype=Hydra Beast
-mana={X}{G}
-power=0
-toughness=0
-text=Feral Hydra comes into play with X +1/+1 counters on it. -- {3}: Put a +1/+1 counter on Feral Hydra. Any player may play this ability
-auto=counter(1/1,X)
-auto={3}:counter(1/1)
-grade=borderline
-[/card]
-[card]
-name=Feral Animist
-auto={G}:p/0
-text={3}: Feral Animist gets +X/+0 until end of turn, where X is its power.
-mana={G}
+
+name=Feral Hydra
+
 type=Creature
-subtype=Goblin Shaman
-power=2
-toughness=1
+
+subtype=Hydra Beast
+
+mana={X}{G}
+
+power=0
+
+toughness=0
+
+text=Feral Hydra enters the battlefield with X +1/+1 counters on it. -- {3}: Put a +1/+1 counter on Feral Hydra. Any player may play this ability
+
+auto=counter(1/1,X)
+
+auto={3}:counter(1/1)
+
+grade=borderline
+
 [/card]
 [card]
 name=Feral Instinct
@@ -19128,6 +19130,15 @@ mana={5}{W}
 type=Sorcery
 [/card]
 [card]
+name=Iceberg
+auto=counter(0/0,X,Ice)
+auto={3}:counter(0/0,1,Ice)
+auto={C(0/0,-1,Ice)}:Add{1}
+text=Iceberg enters the battlefield with X ice counters on it. -- {3}: Put an ice counter on Iceberg. -- Remove an ice counter from Iceberg: Add {1} to your mana pool.
+mana={X}{U}{U}
+type=Enchantment
+[/card]
+[card]
 name=Ice Storm
 target=land
 auto=destroy
@@ -19952,6 +19963,16 @@ power=1
 toughness=2
 [/card]
 [card]
+name=Ivy Elemental
+auto=counter(1/1,X)
+text=Ivy Elemental enters the battlefield with X +1/+1 counters on it.
+mana={X}{G}
+type=Creature
+subtype=Elemental
+power=0
+toughness=0
+[/card]
+[card]
 name=Izzet Boilerworks
 auto=tap
 auto=moveTo(ownerhand) notatarget(land|mybattlefield)
@@ -21981,6 +22002,17 @@ mana={2}
 type=Artifact
 [/card]
 [card]
+name=Krakilin
+auto=counter(1/1,X)
+auto={1}{G}:regenerate
+text=Krakilin enters the battlefield with X +1/+1 counters on it. -- {1}{G}: Regenerate Krakilin.
+mana={X}{G}{G}
+type=Creature
+subtype=Beast
+power=0
+toughness=0
+[/card]
+[card]
 name=Kranioceros
 auto={1}{W}:0/3
 text={1}{W}: Kranioceros gets +0/+3 until end of turn.
@@ -22909,6 +22941,18 @@ power=3
 toughness=2
 [/card]
 [card]
+name=Lightning Serpent
+abilities=trample,haste
+auto=counter(1/0,X)
+auto=@next end:bury
+text=Trample, haste -- Lightning Serpent enters the battlefield with X +1/+0 counters on it. -- At the beginning of the end step, sacrifice Lightning Serpent.
+mana={X}{R}
+type=Creature
+subtype=Elemental Serpent
+power=2
+toughness=1
+[/card]
+[card]
 name=Lightning Talons
 target=creature
 auto=3/0
@@ -23650,6 +23694,16 @@ power=3
 toughness=4
 [/card]
 [card]
+name=Maga, Traitor to Mortals
+auto=counter(1/1,X) && life:-X opponent
+text=Maga, Traitor to Mortals enters the battlefield with X +1/+1 counters on it. -- When Maga enters the battlefield, target player loses life equal to the number of +1/+1 counters on it.
+mana={X}{B}{B}{B}
+type=Legendary Creature
+subtype=Human Wizard
+power=0
+toughness=0
+[/card]
+[card]
 name=Mage il-Vec
 auto={T}:damage:1 target(creature,player) && discard:1 controller
 text={T}, Discard a card at random: Mage il-Vec deals 1 damage to target creature or player.
@@ -34733,6 +34787,17 @@ power=2
 toughness=2
 [/card]
 [card]
+name=Shifting Wall
+abilities=defender
+auto=counter(1/1,X)
+text=Defender (This creature can't attack.) -- Shifting Wall enters the battlefield with X +1/+1 counters on it.
+mana={X}
+type=Artifact Creature
+subtype=Wall
+power=0
+toughness=0
+[/card]
+[card]
 name=Shimmering Barrier
 auto=defender,first strike
 autohand={2}:cycling