diff --git a/projects/mtg/bin/Res/sets/mtg_todo.dat b/projects/mtg/bin/Res/sets/mtg_todo.dat
index 2a37be3cb..a9f550a06 100644
--- a/projects/mtg/bin/Res/sets/mtg_todo.dat
+++ b/projects/mtg/bin/Res/sets/mtg_todo.dat
@@ -1174,17 +1174,6 @@ power=2
 toughness=3
 [/card]
 [card]
-name=Aphetto Vulture
-abilities=flying
-auto=@movedTo(this|graveyard) from(inplay):may moveto(mylibrary) target(zombie|mygraveyard) ##don't understand why this doesnt work...
-text=Flying -- When Aphetto Vulture is put into a graveyard from the battlefield, you may put target Zombie card from your graveyard on top of your library.
-mana={4}{B}{B}
-type=Creature
-subtype=Zombie Bird
-power=3
-toughness=2
-[/card]
-[card]
 name=Aphotic Wisps
 text=Target creature becomes black and gains fear until end of turn. (It can't be blocked except by artifact creatures and/or black creatures.) -- Draw a card.
 mana={B}
@@ -2675,15 +2664,6 @@ mana={5}
 type=Artifact
 [/card]
 [card]
-name=Barishi
-text=When Barishi is put into a graveyard from the battlefield, exile Barishi, then shuffle all creature cards from your graveyard into your library.
-mana={2}{G}{G}
-type=Creature
-subtype=Elemental
-power=4
-toughness=3
-[/card]
-[card]
 name=Barkshell Blessing
 text=Target creature gets +2/+2 until end of turn. -- Conspire (As you cast this spell, you may tap two untapped creatures you control that share a color with it. When you do, copy it and you may choose a new target for the copy.)
 mana={GW}
@@ -6050,15 +6030,6 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
-name=Cho-Manno, Revolutionary
-text=Prevent all damage that would be dealt to Cho-Manno, Revolutionary.
-mana={2}{W}{W}
-type=Legendary Creature
-subtype=Human Rebel
-power=2
-toughness=2
-[/card]
-[card]
 name=Choice of Damnations
 text=Target opponent chooses a number. You may have that player lose that much life. If you don't, that player sacrifices all but that many permanents.
 mana={5}{B}
@@ -18482,12 +18453,6 @@ mana={3}{R}{R}
 type=Sorcery
 [/card]
 [card]
-name=Incinerate
-text=Incinerate deals 3 damage to target creature or player. A creature dealt damage this way can't be regenerated this turn.
-mana={1}{R}
-type=Instant
-[/card]
-[card]
 name=Incite Hysteria
 text=Radiance - Until end of turn, target creature and each other creature that shares a color with it gain "This creature can't block."
 mana={2}{R}
@@ -23241,18 +23206,6 @@ mana={X}{W}{W}
 type=Sorcery
 [/card]
 [card]
-name=Marton Stromgald
-auto=aslongas(marton stromgald[attacking]|myBattlefield) lord(creature[attacking]) foreach(creature[attacking]|myBattlefield) 1/1 other
-auto=aslongas(marton stromgald[blocking]|myBattlefield) lord(creature[blocking]) foreach(creature[blocking]|myBattlefield) 1/1 other
-###Does not work!
-text=Whenever Marton Stromgald attacks, other attacking creatures get +1/+1 until end of turn for each attacking creature other than Marton Stromgald. -- Whenever Marton Stromgald blocks, other blocking creatures get +1/+1 until end of turn for each blocking creature other than Marton Stromgald.
-mana={2}{R}{R}
-type=Legendary Creature
-subtype=Human Knight
-power=1
-toughness=1
-[/card]
-[card]
 name=Martyr of Ashes
 text={2}, Reveal X red cards from your hand, Sacrifice Martyr of Ashes: Martyr of Ashes deals X damage to each creature without flying.
 mana={R}
@@ -30613,12 +30566,6 @@ power=7
 toughness=6
 [/card]
 [card]
-name=Raking Canopy
-text=Whenever a creature with flying attacks you, Raking Canopy deals 4 damage to it.
-mana={1}{G}{G}
-type=Enchantment
-[/card]
-[card]
 name=Raksha Golden Cub
 auto=aslongas(this[equip]) lord(creature[cat]|myBattlefield) 2/2
 auto=aslongas(this[equip]) lord(creature[cat]|myBattlefield) double strike
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 51de9bc01..bd21aa392 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -1421,6 +1421,17 @@ power=4
 toughness=3
 [/card]
 [card]
+name=Aphetto Vulture
+abilities=flying
+autograveyard=@movedTo(this|graveyard) from(battlefield):may moveto(mylibrary) target(zombie other|mygraveyard)
+text=Flying -- When Aphetto Vulture is put into a graveyard from the battlefield, you may put target Zombie card from your graveyard on top of your library.
+mana={4}{B}{B}
+type=Creature
+subtype=Zombie Bird
+power=3
+toughness=2
+[/card]
+[card]
 name=Apocalypse
 auto=moveTo(exile) all(*|battlefield)
 auto=moveTo(mygraveyard) all(*|myhand)
@@ -2832,6 +2843,17 @@ mana={2}{W}
 type=Sorcery
 [/card]
 [card]
+name=Barishi
+auto=@movedto(this|graveyard) from(battlefield):moveto(mylibrary) all(other creature|myGraveyard) && shuffle
+autograveyard=@movedto(this|graveyard) from(battlefield):moveto(exile)
+text=When Barishi is put into a graveyard from the battlefield, exile Barishi, then shuffle all creature cards from your graveyard into your library.
+mana={2}{G}{G}
+type=Creature
+subtype=Elemental
+power=4
+toughness=3
+[/card]
+[card]
 name=Barkhide Mauler
 autohand={2}:cycling
 text=Cycling {2} ({2}, Discard this card: Draw a card.)
@@ -6553,6 +6575,16 @@ mana={3}
 type=Artifact
 [/card
 [card]
+name=Cho-Manno, Revolutionary
+auto=preventAllCombatDamage to(this)
+text=Prevent all damage that would be dealt to Cho-Manno, Revolutionary.
+mana={2}{W}{W}
+type=Legendary Creature
+subtype=Human Rebel
+power=2
+toughness=2
+[/card]
+[card]
 name=Choke
 auto=lord(island) doesnotuntap
 text=Islands don't untap during their controllers' untap steps.
@@ -18972,6 +19004,15 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+name=Incinerate
+target=creature,player
+auto=cantregenerate
+auto=damage:3
+text=Incinerate deals 3 damage to target creature or player. A creature dealt damage this way can't be regenerated this turn.
+mana={1}{R}
+type=Instant
+[/card]
+[card]
 name=Incurable Ogre
 mana={3}{R}
 type=Creature
@@ -23545,6 +23586,7 @@ type=Instant
 name=Mana Vault
 auto=doesnotuntap
 auto={4}:untap myUpkeepOnly
+auto={T}:add {3}
 alias=1124
 text=Mana Vault doesn't untap during your untap step. -- At the beginning of your upkeep, you may pay {4}. If you do, untap Mana Vault. -- At the beginning of your draw step, if Mana Vault is tapped, it deals 1 damage to you. -- {T}: Add {3} to your mana pool.
 mana={1}
@@ -23859,6 +23901,17 @@ power=4
 toughness=3
 [/card]
 [card]
+name=Marton Stromgald
+auto=@each combatblockers:aslongas(Marton Stromgald[attacking]) foreach(other creature[attacking]) all(other creature[attacking]) 1/1 ueot
+auto=@each combatblockers:aslongas(Marton Stromgald[blocking]) foreach(other creature[blocking]) all(other creature[blocking]) 1/1 ueot 
+text=Whenever Marton Stromgald attacks, other attacking creatures get +1/+1 until end of turn for each attacking creature other than Marton Stromgald. -- Whenever Marton Stromgald blocks, other blocking creatures get +1/+1 until end of turn for each blocking creature other than Marton Stromgald.
+mana={2}{R}{R}
+type=Legendary Creature
+subtype=Human Knight
+power=1
+toughness=1
+[/card]
+[card]
 name=Martyred Rusalka
 auto={W}{S(creature|myBattlefield)}:cantattack target(creature)
 text={W}, Sacrifice a creature: Target creature can't attack this turn.
@@ -30104,6 +30157,13 @@ power=5
 toughness=3
 [/card]
 [card]
+name=Raking Canopy
+auto=@each opponent blockers:damage:4 all(creature[flying;attacking])
+text=Whenever a creature with flying attacks you, Raking Canopy deals 4 damage to it.
+mana={1}{G}{G}
+type=Enchantment
+[/card]
+[card]
 name=Rakka Mar
 abilities=haste
 auto={R}{T}:token(Elemental,creature, 3/1,haste red)