diff --git a/projects/mtg/bin/Res/sets/mtg_todo.dat b/projects/mtg/bin/Res/sets/mtg_todo.dat
index 201d8e026..660899a1c 100644
--- a/projects/mtg/bin/Res/sets/mtg_todo.dat
+++ b/projects/mtg/bin/Res/sets/mtg_todo.dat
@@ -7672,6 +7672,13 @@ type=Artifact
 [/card]
 [card]
 name=Crucible of Worlds
+auto={0}:may moveTo(myBattlefield) target(land|mygraveyard) limit:1 myTurnOnly
+# Above line does not work: "May moveto" from graveyards does
+# not work due to interface issues. The "limit:1" doesn't work
+# here either. Even if both worked, then the card would allow
+# you to play lands *in addition* to the 1 land you can play per
+# turn. Instead it should just give you the option to play this
+# 1 land from your hand or your graveyard.
 text=You may play land cards from your graveyard.
 mana={3}
 type=Artifact
@@ -8280,8 +8287,9 @@ type=Sorcery
 [/card]
 [card]
 name=Darksteel Colossus
+abilities=indestructible
 text=Trample Darksteel Colossus is indestructible. If Darksteel Colossus would be put into a graveyard from anywhere, reveal Darksteel Colossus and shuffle it into its owner's library instead.
-mana={1}{1}
+mana={11}
 type=Artifact Creature
 subtype=Golem
 power=11
@@ -16512,6 +16520,10 @@ subtype=Aura
 [/card]
 [card]
 name=Guerrilla Tactics
+target=creature,player
+auto=damage:2
+auto=@movedto(graveyard) from(myhand):damage:4
+#Target does not work with @ unless there is a may
 text=Guerrilla Tactics deals 2 damage to target creature or player.     When a spell or ability an opponent controls causes you to discard Guerrilla Tactics, Guerrilla Tactics deals 4 damage to target creature or player.
 mana={1}{R}
 type=Instant
@@ -18163,6 +18175,7 @@ toughness=2
 name=Icatian Infantry
 auto={1}:banding
 auto={1}:first strike
+#Banding is not supported in Wagic 0.9
 text={1}: Icatian Infantry gains banding until end of turn.     {1}: Icatian Infantry gains first strike until end of turn.
 mana={W}
 type=Creature
@@ -20653,7 +20666,7 @@ toughness=5
 [card]
 name=Kjeldoran Pride
 target=Creature
-auto=:1/2
+auto=1/2
 auto={2}{U}:moveto(creature|myinplay)
 text=Enchant creature Enchanted creature gets +1/+2. {2}{U}: Attach Kjeldoran Pride to target creature other than enchanted creature.
 mana={1}{W}
@@ -21622,12 +21635,11 @@ toughness=2
 [/card]
 [card]
 name=Legacy Weapon
-abilities=legendary
 auto={W}{U}{B}{R}{G}:moveto(exile) target(*)
 #as the same ability as darksteel collosus
 text={W}{U}{B}{R}{G}: Remove target permanent from the game.     If Legacy Weapon would be put into a graveyard from anywhere, reveal Legacy Weapon and shuffle it into its owner's library instead.
 mana={7}
-type=Artifact
+type=Legendary Artifact
 [/card]
 [card]
 name=Legacy's Allure
@@ -22910,6 +22922,8 @@ type=Enchantment
 [/card]
 [card]
 name=Magnetic Mountain
+auto=lord(creature[blue]) doesnotuntap
+auto=lord(creature[blue]) {4}:untap
 text=Blue creatures don't untap during their controllers' untap steps. At the beginning of each player's upkeep, that player may choose any number of tapped blue creatures he or she controls and pay {4} for each creature chosen this way. If the player does, untap those creatures.
 mana={1}{R}{R}
 type=Enchantment
@@ -24257,6 +24271,9 @@ type=Sorcery
 [/card]
 [card]
 name=Mind Rot
+target=player
+auto=discard:2
+#No Discard unless random
 text=Target player discards two cards.
 mana={2}{B}
 type=Sorcery
@@ -24655,6 +24672,7 @@ type=Artifact
 [/card]
 [card]
 name=Mishra's War Machine
+abilities=Banding
 text=Banding (Any creatures with banding, and up to one without, can attack in a band. Bands are blocked as a group. If any creatures with banding you control are blocking or being blocked by a creature, you divide that creature's combat damage, not its controller, among any of the creatures it's being blocked by or is blocking.) At the beginning of your upkeep, unless you discard a card, tap Mishra's War Machine and it deals 3 damage to you.
 mana={7}
 type=Artifact Creature
@@ -34596,6 +34614,7 @@ toughness=4
 [/card]
 [card]
 name=Sengir Vampire
+abilities=flying
 text=Flying (This creature can't be blocked except by creatures with flying or reach.)  Whenever a creature dealt damage by Sengir Vampire this turn is put into a graveyard, put a +1/+1 counter on Sengir Vampire.
 mana={3}{B}{B}
 type=Creature
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index c24e9fa2d..f46e781bb 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -1160,7 +1160,7 @@ toughness=5
 [/card]
 [card]
 name=Angel's Feather
-auto=@movedTo(*[white]|stack):may life:1
+auto=@movedTo(*[white]|stack):may life:1 controller
 text=Whenever a player casts a white spell, you may gain 1 life.
 mana={2}
 type=Artifact
@@ -2210,7 +2210,7 @@ toughness=2
 [card]
 name=Aven Fisher
 abilities=flying
-auto=@movedTo(this|graveyard):draw:1
+auto=@movedTo(this|graveyard) from(battlefield):may draw:1
 text=Flying (This creature can't be blocked except by creatures with flying or reach.)  When Aven Fisher is put into a graveyard from the battlefield, you may draw a card.
 mana={3}{U}
 type=Creature
@@ -2531,7 +2531,7 @@ type=Sorcery
 [card]
 name=Ball Lightning
 abilities=trample,haste
-auto=@next endofturn:bury
+auto=@next end:bury
 text=Trample (If this creature would deal enough damage to its blockers to destroy them, you may have it deal the rest of its damage to defending player or planeswalker.)   Haste (This creature can attack and  as soon as it comes under your control.)   At the beginning of the end step, sacrifice Ball Lightning.
 mana={R}{R}{R}
 type=Creature
@@ -3376,11 +3376,12 @@ toughness=2
 [card]
 name=Birds of Paradise
 abilities=flying
+auto={T}:Add{G}
+# put {G} first so that the AI can produce it.
 auto={T}:Add{W}
 auto={T}:Add{U}
 auto={T}:Add{B}
 auto={T}:Add{R}
-auto={T}:Add{G}
 text=Flying (This creature can't be blocked except by creatures with flying or reach.)   {T}: Add one mana of any color to your mana pool.
 mana={G}
 type=Creature
@@ -3569,7 +3570,6 @@ type=Sorcery
 name=Blaze
 target=creature,player
 auto=damage:X
-alias=1291
 text=Blaze deals X damage to target creature or player.
 mana={X}{R}
 type=Sorcery
@@ -4783,7 +4783,7 @@ type=Sorcery
 [/card]
 [card]
 name=Breath of Life
-target=creature(myGraveyard)
+target=creature|mygraveyard
 auto=moveTo(myBattlefield)
 text=Return target creature card from your graveyard to the battlefield.
 mana={3}{W}
@@ -6433,11 +6433,11 @@ type=Sorcery
 [/card]
 [card]
 name=Chromatic Sphere
-auto={1}{T}{S}:Add{G} && Draw:1
-auto={1}{T}{S}:Add{R} && Draw:1
-auto={1}{T}{S}:Add{U} && Draw:1
-auto={1}{T}{S}:Add{B} && Draw:1
-auto={1}{T}{S}:Add{W} && Draw:1
+auto={1}{T}{S}:Add{G} && Draw:1 controller
+auto={1}{T}{S}:Add{R} && Draw:1 controller
+auto={1}{T}{S}:Add{U} && Draw:1 controller
+auto={1}{T}{S}:Add{B} && Draw:1 controller
+auto={1}{T}{S}:Add{W} && Draw:1 controller
 text={1}, {T}, Sacrifice Chromatic Sphere: Add one mana of any color to your mana pool. Draw a card.
 mana={1}
 type=Artifact
@@ -7752,7 +7752,7 @@ type=Land
 name=Cremate
 target=*|graveyard
 auto=moveto(exile)
-auto=draw:1
+auto=draw:1 controller
 text=Exile target card in a graveyard. Draw a card.
 mana={B}
 type=Instant
@@ -7905,6 +7905,7 @@ toughness=*
 [/card]
 [card]
 name=Crown of Flames
+target=creature
 auto={R}:1/0
 auto={R}:moveTo(ownerhand)
 text=Enchant creature   {R}: Enchanted creature gets +1/+0 until end of turn.     {R}: Return Crown of Flames to its owner's hand.
@@ -8420,7 +8421,7 @@ subtype=Aura
 [/card]
 [card]
 name=Dark Ritual
-auto=Add {B}{B}{B}
+auto=Add{B}{B}{B}
 text=Add {B}{B}{B} to your mana pool.
 mana={B}
 type=Instant
@@ -9174,7 +9175,7 @@ type=Sorcery
 [/card]
 [card]
 name=Demon's Horn
-auto=@movedTo(*[black]|stack):may life:1
+auto=@movedTo(*[black]|stack):may life:1 controller
 text=Whenever a player casts a black spell, you may gain 1 life.
 mana={2}
 type=Artifact
@@ -10127,7 +10128,7 @@ toughness=3
 [/card]
 [card]
 name=Dragon's Claw
-auto=@movedTo(*[red]|stack):may life:1
+auto=@movedTo(*[red]|stack):may life:1 controller
 text=Whenever a player casts a red spell, you may gain 1 life.
 mana={2}
 type=Artifact
@@ -10327,7 +10328,6 @@ toughness=5
 name=Dreamborn Muse
 auto=@each my upkeep:foreach(*|myhand) deplete:1 controller
 auto=@each opponent upkeep:foreach(*|opponenthand) deplete:1 opponent
-alias=135246
 text=At the beginning of each player's upkeep, that player puts the top X cards of his or her library into his or her graveyard, where X is the number of cards in his or her hand.
 mana={2}{U}{U}
 type=Creature
@@ -10456,7 +10456,7 @@ toughness=3
 [/card]
 [card]
 name=Dross Crocodile
-mana={3}{B
+mana={3}{B}
 type=Creature
 subtype=Zombie Crocodile
 power=5
@@ -10837,7 +10837,7 @@ toughness=1
 [/card]
 [card]
 name=Dwarven Weaponsmith
-auto={T}{S(artifact|myBattlefield)}:counter(1/1,1) target(creature) myTurnOnly
+auto={T}{S(artifact|myBattlefield)}:counter(1/1,1) target(creature) myUpkeepOnly
 text=Sacrifice an artifact: Put a +1/+1 counter on target creature. Activate this ability only during your upkeep.
 mana={1}{R}
 type=Creature
@@ -14781,7 +14781,7 @@ toughness=5
 [/card]
 [card]
 name=Ghost Warden
-auto={T}:1/1 target(creature)
+auto={T}:1/1 target(creature[attacking;blocking])
 text={T}: Target creature gets +1/+1 until end of turn.
 mana={1}{W}
 type=Creature
@@ -18274,7 +18274,6 @@ toughness=1
 name=Hurricane
 auto=damage:X all(creature[flying])
 auto=damage:X all(player)
-alias=1251
 text=Hurricane deals X damage to each creature with flying and each player.
 mana={X}{G}
 type=Sorcery
@@ -20145,7 +20144,7 @@ toughness=2
 [/card]
 [card]
 name=Kavu Climber
-auto=draw:1
+auto=draw:1 controller
 text=When Kavu Climber enters the battlefield, draw a card.
 mana={3}{G}{G}
 type=Creature
@@ -21135,7 +21134,7 @@ toughness=4
 [/card]
 [card]
 name=Kraken's Eye
-auto=@movedTo(*[blue]|stack): may life:1
+auto=@movedTo(*[blue]|stack): may life:1 controller
 text=Whenever a player casts a blue spell, you may gain 1 life.
 mana={2}
 type=Artifact
@@ -22646,7 +22645,6 @@ toughness=2
 [card]
 name=Lumengrid Warden
 mana={1}{U}
-mana={1}{U}
 type=Creature
 subtype=Human Wizard
 power=1
@@ -23745,7 +23743,7 @@ toughness=1
 [/card]
 [card]
 name=Mesa Enchantress
-auto=@movedTo(enchantment|mystack): may draw:1
+auto=@movedTo(enchantment|mystack): may draw:1 controller
 text=Whenever you cast an enchantment spell, you may draw a card.
 mana={1}{W}{W}
 type=Creature
@@ -23982,8 +23980,7 @@ type=Sorcery
 [/card]
 [card]
 name=Mind Spring
-auto=Draw:X
-alias=1192
+auto=draw:X controller
 text=Draw X cards.
 mana={X}{U}{U}
 type=Sorcery
@@ -26641,7 +26638,7 @@ type=Enchantment
 [/card]
 [card]
 name=Onulet
-auto=@movedTo(this|graveyard):life:2 controller
+auto=@movedTo(this|graveyard) from(this|battlefield):life:2 controller
 text=When Onulet is put into a graveyard from the battlefield, you gain 2 life.
 mana={3}
 type=Artifact Creature
@@ -29963,7 +29960,7 @@ type=Sorcery
 name=Recover
 target=creature|mygraveyard
 auto=moveTo(myhand)
-auto=draw:1
+auto=draw:1 controller
 text=Return target creature card from your graveyard to your hand.     Draw a card.
 mana={2}{B}
 type=Sorcery
@@ -30202,6 +30199,8 @@ toughness=2
 [card]
 name=Reminisce
 target=player
+# auto=moveTo(ownerlibrary) all(*|ownergraveyard)
+# Found one hardcoded and one softcoded copy of the card - todo: check whether softcoding works
 alias=129698
 text=Target player shuffles his or her graveyard into his or her library.
 mana={2}{U}
@@ -30542,8 +30541,8 @@ type=Sorcery
 [/card]
 [card]
 name=Reviving Dose
-auto=life:3
-auto=draw:1
+auto=life:3 controller
+auto=draw:1 controller
 text=You gain 3 life.   Draw a card.
 mana={2}{W}
 type=Instant
@@ -32990,7 +32989,7 @@ subtype=Aura
 [/card]
 [card]
 name=Serpent Warrior
-auto=life:-3
+auto=life:-controller
 text=When Serpent Warrior enters the battlefield, you lose 3 life.
 mana={2}{B}
 type=Creature
@@ -36587,7 +36586,7 @@ type=Sorcery
 [/card]
 [card]
 name=Starlight Invoker
-auto={7}{W}:life:5
+auto={7}{W}:life:5 controller
 text={7}{W}: You gain 5 life.
 mana={1}{W}
 type=Creature
@@ -38959,6 +38958,8 @@ subtype=Aura
 [card]
 name=The Hive
 auto={5}{T}:token(Wasp,creature artifact insect, 1/1,flying artifact)
+#auto={5},{T}:token(-1138)
+#Todo: find a good way to reconcile the new token syntax with the new primitives/reprints structure
 text={5}, {T}: Put a 1/1 Insect artifact creature token with flying named Wasp into play. (It can't be blocked except by creatures with flying or reach.)
 mana={5}
 type=Artifact
@@ -38991,7 +38992,7 @@ toughness=7
 [/card]
 [card]
 name=Theft of Dreams
-auto=foreach(creature[-tapped]|opponentBattlefield) draw:1
+auto=foreach(creature[tapped]|opponentBattlefield) draw:1
 text=Draw a card for each tapped creature target opponent controls.
 mana={2}{U}
 type=Sorcery
@@ -40965,7 +40966,7 @@ type=Instant
 [card]
 name=Untamed Wilds
 target=basic|myLibrary
-auto=moveTo(myInPlay)
+auto=moveTo(myBattlefield)
 text=Search your library for a basic land card and put that card onto the battlefield. Then shuffle your library.
 mana={2}{G}
 type=Sorcery
@@ -41574,7 +41575,7 @@ toughness=3
 [/card]
 [card]
 name=Venerable Monk
-auto=life:2
+auto=life:2 controller
 text=When Venerable Monk enters the battlefield, you gain 2 life.
 mana={2}{W}
 type=Creature
@@ -44618,7 +44619,7 @@ toughness=3
 [/card]
 [card]
 name=Wurm's Tooth
-auto=@movedTo(*[green]|stack): may life:1
+auto=@movedTo(*[green]|stack): may life:1 controller
 text=Whenever a player casts a green spell, you may gain 1 life.
 mana={2}
 type=Artifact
@@ -44734,7 +44735,7 @@ toughness=1
 [/card]
 [card]
 name=Yavimaya Enchantress
-auto=foreach(enchantment) 1/1
+auto=foreach(enchantment|battlefield) 1/1
 text=Yavimaya Enchantress gets +1/+1 for each enchantment on the battlefield.
 mana={2}{G}
 type=Creature