diff --git a/projects/mtg/bin/Res/sets/mtg_todo.dat b/projects/mtg/bin/Res/sets/mtg_todo.dat
index 959548c42..a7a8b4ad1 100644
--- a/projects/mtg/bin/Res/sets/mtg_todo.dat
+++ b/projects/mtg/bin/Res/sets/mtg_todo.dat
@@ -1205,17 +1205,6 @@ type=Tribal Sorcery
 subtype=Merfolk
 [/card]
 [card]
-name=Arashi, the Sky Asunder
-auto={X}{G}{T}:thisforeach(X) damage:1 target(creature[flying])
-autohand={X}{G}{G}{S}:thisforeach(X) damage:1 all(creature[flying])
-text={X}{G}, {T}: Arashi, the Sky Asunder deals X damage to target creature with flying. -- Channel - {X}{G}{G}, Discard Arashi: Arashi deals X damage to each creature with flying.
-mana={3}{G}{G}
-type=Legendary Creature
-subtype=Spirit
-power=5
-toughness=5
-[/card]
-[card]
 name=Arbiter of Knollridge
 text=Vigilance -- When Arbiter of Knollridge enters the battlefield, each player's life total becomes the highest life total among all players.
 mana={6}{W}
@@ -2299,17 +2288,6 @@ power=3
 toughness=2
 [/card]
 [card]
-name=Ballista Squad
-auto={X}{W}{T}:damage:x target(creature[attacking;blocking])
-#X cost doesn't work for abilities yet :(
-text={X}{W}, {T}: Ballista Squad deals X damage to target attacking or blocking creature.
-mana={3}{W}
-type=Creature
-subtype=Human Rebel
-power=2
-toughness=2
-[/card]
-[card]
 name=Ballyrush Banneret
 text=Kithkin spells and Soldier spells you cast cost {1} less to cast.
 mana={1}{W}
@@ -2815,12 +2793,6 @@ power=1
 toughness=1
 [/card]
 [card]
-name=Belbe's Armor
-text={X}, {T}: Target creature gets -X/+X until end of turn.
-mana={3}
-type=Artifact
-[/card]
-[card]
 name=Belbe's Portal
 text=As Belbe's Portal enters the battlefield, choose a creature type. -- {3}, {T}: You may put a creature card of the chosen type from your hand onto the battlefield.
 mana={5}
@@ -4574,22 +4546,11 @@ toughness=1
 [/card]
 [card]
 name=Cackling Flames
-target=creature,player
-auto=aslongas(*|myHand)damage:3
 text=Cackling Flames deals 3 damage to target creature or player. -- Hellbent - Cackling Flames deals 5 damage to that creature or player instead if you have no cards in hand.
 mana={3}{R}
 type=Instant
 [/card]
 [card]
-name=Cackling Witch
-text={X}{B}, {T}, Discard a card: Target creature gets +X/+0 until end of turn.
-mana={1}{B}
-type=Creature
-subtype=Human Spellshaper
-power=1
-toughness=1
-[/card]
-[card]
 name=Cadaverous Knight
 abilities=flanking
 auto={1}{B}{B}:regenerate
@@ -5859,15 +5820,6 @@ power=1
 toughness=2
 [/card]
 [card]
-name=Cinder Elemental
-text={X}{R}, {T}, Sacrifice Cinder Elemental: Cinder Elemental deals X damage to target creature or player.
-mana={3}{R}
-type=Creature
-subtype=Elemental
-power=2
-toughness=2
-[/card]
-[card]
 name=Cinder Marsh
 text={T}: Add {1} to your mana pool. -- {T}: Add {B} or {R} to your mana pool. Cinder Marsh doesn't untap during your next untap step.
 type=Land
@@ -14634,15 +14586,6 @@ mana={4}
 type=Artifact
 [/card]
 [card]
-name=Goblin Dynamo
-text={T}: Goblin Dynamo deals 1 damage to target creature or player. -- {X}{R}, {T}, Sacrifice Goblin Dynamo: Goblin Dynamo deals X damage to target creature or player.
-mana={5}{R}{R}
-type=Creature
-subtype=Goblin Mutant
-power=4
-toughness=4
-[/card]
-[card]
 name=Goblin Festival
 text={2}: Goblin Festival deals 1 damage to target creature or player. Flip a coin. If you lose the flip, choose one of your opponents. That player gains control of Goblin Festival.
 mana={1}{R}
@@ -26557,15 +26500,6 @@ mana={3}{R}
 type=Sorcery
 [/card]
 [card]
-name=Pain Kami
-text={X}{R}, Sacrifice Pain Kami: Pain Kami deals X damage to target creature.
-mana={2}{R}
-type=Creature
-subtype=Spirit
-power=2
-toughness=2
-[/card]
-[card]
 name=Pain Magnification
 text=Whenever an opponent is dealt 3 or more damage by a single source, that player discards a card.
 mana={1}{B}{R}
@@ -37447,15 +37381,6 @@ mana={8}{U}{U}
 type=Sorcery
 [/card]
 [card]
-name=Swell of Courage
-auto=lord(creature|myBattlefield)2/2
-autohand={X}{W}{W}{S}:counter(1/1,x) target(creature)
-#Counter does not accept x value
-text=Creatures you control get +2/+2 until end of turn. -- Reinforce X - {X}{W}{W} ({X}{W}{W}, Discard this card: Put X +1/+1 counters on target creature.)
-mana={3}{W}{W}
-type=Instant
-[/card]
-[card]
 name=Swelter
 text=Swelter deals 2 damage to each of two target creatures.
 mana={3}{R}
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index b128daab2..b645214ba 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -1561,6 +1561,17 @@ power=2
 toughness=6
 [/card]
 [card]
+name=Arashi, the Sky Asunder
+auto={X}{G}{T}:thisforeach(X) damage:1 target(creature[flying])
+autohand={X}{G}{G}{S}:thisforeach(X) damage:1 all(creature[flying])
+text={X}{G}, {T}: Arashi, the Sky Asunder deals X damage to target creature with flying. -- Channel - {X}{G}{G}, Discard Arashi: Arashi deals X damage to each creature with flying.
+mana={3}{G}{G}
+type=Legendary Creature
+subtype=Spirit
+power=5
+toughness=5
+[/card]
+[card]
 name=Arbor Elf
 auto={T}:untap target(forest)
 text={T}: Untap target Forest.
@@ -2879,6 +2890,16 @@ power=6
 toughness=1
 [/card]
 [card]
+name=Ballista Squad
+auto={X}{W}{T}:thisforeach(X) damage:1 target(creature[attacking;blocking])
+text={X}{W}, {T}: Ballista Squad deals X damage to target attacking or blocking creature.
+mana={3}{W}
+type=Creature
+subtype=Human Rebel
+power=2
+toughness=2
+[/card]
+[card]
 name=Balloon Peddler
 auto={U}{T}{S(*|myhand)}:flying target(creature)
 text={U}, {T}, Discard a card: Target creature gains flying until end of turn.
@@ -3538,6 +3559,13 @@ type=Artifact
 subtype=Equipment
 [/card]
 [card]
+name=Belbe's Armor
+auto={X}{T}:thisforeach(X) -1/1 target(creature)
+text={X}, {T}: Target creature gets -X/+X until end of turn.
+mana={3}
+type=Artifact
+[/card]
+[card]
 name=Belbe's Percher
 abilities=flying,cloud
 text=Flying -- Belbe's Percher can block only creatures with flying.
@@ -5716,6 +5744,16 @@ power=4
 toughness=4
 [/card]
 [card]
+name=Cackling Witch
+auto={X}{B}{T}{S(*|myhand)}:thisforeach(X) 1/0 target(creature)
+text={X}{B}, {T}, Discard a card: Target creature gets +X/+0 until end of turn.
+mana={1}{B}
+type=Creature
+subtype=Human Spellshaper
+power=1
+toughness=1
+[/card]
+[card]
 name=Cackling Imp
 abilities=flying
 auto={T}:life:-1 target(player)
@@ -7064,6 +7102,27 @@ power=1
 toughness=1
 [/card]
 [card]
+name=Goblin Dynamo
+auto={T}:damage:1 target(creature,player)
+auto={X}{R}{T}{S}:thisforeach(X) damage:1 target(creature,player)
+text={T}: Goblin Dynamo deals 1 damage to target creature or player. -- {X}{R}, {T}, Sacrifice Goblin Dynamo: Goblin Dynamo deals X damage to target creature or player.
+mana={5}{R}{R}
+type=Creature
+subtype=Goblin Mutant
+power=4
+toughness=4
+[/card]
+[card]
+name=Cinder Elemental
+auto={X}{R}{T}{S}:thisforeach(X) damage:1 target(creature,player)
+text={X}{R}, {T}, Sacrifice Cinder Elemental: Cinder Elemental deals X damage to target creature or player.
+mana={3}{R}
+type=Creature
+subtype=Elemental
+power=2
+toughness=2
+[/card]
+[card]
 name=Cinder Giant
 auto=@each my upkeep:damage:2 all(other creature|myBattlefield)
 text=At the beginning of your upkeep, Cinder Giant deals 2 damage to each other creature you control.
@@ -20880,6 +20939,17 @@ mana={2}
 type=Artifact
 [/card]
 [card]
+name=Jiwari, the Earth Aflame
+auto={X}{R}{T}:thisforeach(X) damage:1 target(creature[-flying])
+autohand={X}{R}{R}{R}{S}:thisforeach(X) damage:1 all(creature[-flying])
+text={X}{R}, {T}: Jiwari, the Earth Aflame deals X damage to target creature without flying. -- Channel - {X}{R}{R}{R}, Discard Jiwari: Jiwari deals X damage to each creature without flying.
+mana={3}{R}{R}
+type=Legendary Creature
+subtype=Spirit
+power=3
+toughness=3
+[/card]
+[card]
 name=Jodah's Avenger
 auto={0}:double strike && -1/-1
 auto={0}:protection from red && -1/-1
@@ -29074,6 +29144,16 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+name=Pain Kami
+auto={X}{R}{S}:thisforeach(X) damage:1 target(creature)
+text={X}{R}, Sacrifice Pain Kami: Pain Kami deals X damage to target creature.
+mana={2}{R}
+type=Creature
+subtype=Spirit
+power=2
+toughness=2
+[/card]
+[card]
 name=Paladin en-Vec
 abilities=first strike,protection from black,protection from red
 text=First strike, protection from black and from red (This creature deals combat damage before creatures without first strike. It can't be blocked, targeted, dealt damage, or enchanted by anything black or red.)
@@ -40570,6 +40650,14 @@ mana={1}{B}{B}
 type=Instant
 [/card]
 [card]
+name=Swell of Courage
+auto=lord(creature|myBattlefield) 2/2
+autohand={X}{W}{W}{S}:thisfroeach(X) counter(1/1,1) target(creature)
+text=Creatures you control get +2/+2 until end of turn. -- Reinforce X - {X}{W}{W} ({X}{W}{W}, Discard this card: Put X +1/+1 counters on target creature.)
+mana={3}{W}{W}
+type=Instant
+[/card]
+[card]
 name=Swift Silence
 auto=foreach(other *|stack) draw:1
 auto=fizzle all(other *|stack)