diff --git a/projects/mtg/bin/Res/sets/primitives/_macros.txt b/projects/mtg/bin/Res/sets/primitives/_macros.txt
index 66ba75c59..67a4d03fd 100644
--- a/projects/mtg/bin/Res/sets/primitives/_macros.txt
+++ b/projects/mtg/bin/Res/sets/primitives/_macros.txt
@@ -75,19 +75,19 @@
 # Battalion
 #AUTO_DEFINE _BATTALION_ @combat(attacking) source(this) restriction{type(other creature[attacking]|myBattlefield)~morethan~1}:
 
-# Champion
+# Champion, not implemented
 #AUTO_DEFINE _CHAMPION_($Word) aslongas(other $word|myBattlefield) choice notAtarget(other $word|myBattlefield) (blink)forsrc oneshot
 
-# Metalcraft
+# Metalcraft, not implemented
 #AUTO_DEFINE _METALCRAFT_ aslongas(artifact|mybattlefield) >2
 
-# Echo
+# Echo, not implemented
 #AUTO_DEFINE _ECHO_($cost) $cost[{$c};next upkeep] sacrifice
 
-# Threshold
+# Threshold, not implemented
 #AUTO_DEFINE _THRESHOLD_ if type(*|mygraveyard)~morethan~6
 
-# Splice onto Arcane
+# Splice onto Arcane, not implemented
 #AUTO_DEFINE _SPLICEARCANE_ movedTo(*[Arcane]|myStack):may castcard(copied noevent) target(*[Arcane]|myHand)
 
 # Ripple
@@ -96,10 +96,10 @@
 # Recover                              
 #AUTO_DEFINE _RECOVER_($cost) @movedTo(creature|myGraveyard) from(Battlefield):may pay{$cost} name(Return to owner Hand) moveTo(ownerHand) all(this) donothing?moveTo(exile) all(this)
 
-# Clash
+# Clash, not implemented
 $AUTO_DEFINE _CLASH_ Put here a code if compare the casting cost based on Erratic Explosion. Meaby it would work with a few fix
 
-# Conspire
+# Conspire, not implemented
 #AUTO_DEFINE _CONSPIRE_ @movedTo(this|myStak):may {T(creature|myBattlefield)}{T(creature|myBattlefield)} castcard(copied noevent) target(*|myStack)
 
 # Proliferate
@@ -108,16 +108,16 @@ $AUTO_DEFINE _CLASH_ Put here a code if compare the casting cost based on Errati
 # Scavenge
 #AUTO_DEFINE _SCAVENGE_($cost) {$cost}:name(scavenge) counter(1/1,storedpower) target(creature) asSorcery
 
-# Monstrosity
+# Monstrosity, not implemented
 #AUTO_DEFINE _MONSTROSITY_($cost,$c) name(Monstrosity) this(cantargetcard(*[-monstrous]) {$cost}:becomes(monstrous) forever && counter(1/1.$c)
 
-# Outlast
-#AUTO_DEFINE _OUTLAST_($cost) {$cost}{$cost}:counter(1/1,1) all(this) asSorcery
+# Outlast, not implemented
+#AUTO_DEFINE _OUTLAST_($cost) {$cost}{$cost}:counter(1/1) all(this) asSorcery
 
 # Investigate token, Shadows over Innistrad SOI
 #AUTO_DEFINE _INVESTIGATE_ token(Clue)
 
-# Soulshift
+# Soulshift, not implemented
 #AUTO_DEFINE _SOULSHIFT_($c) @movedTo(this|myGraveyard) from(battlefield):may moveTo(myHand) target(creature[spirit;manacost<=$c]|myGraveyard)
 
 # Ascend, Set XLN
@@ -145,7 +145,7 @@ $AUTO_DEFINE _CLASH_ Put here a code if compare the casting cost based on Errati
 # Surveil
 #AUTO_DEFINE _SURVEIL_ name(surveil) reveal:1 optionone name(put in graveyard) target(<upto:1>*|reveal) moveto(ownergraveyard) optiononeend optiontwo name(put in library) target(<1>*|reveal) moveto(ownerlibrary) optiontwoend revealend
 
-# Undergrowth
+# Undergrowth, not implemented
 #AUTO_DEFINE _UNDERGROWTH_ foreach(creature|myGraveyard)
 
 # Afterlife
@@ -157,7 +157,7 @@ $AUTO_DEFINE _CLASH_ Put here a code if compare the casting cost based on Errati
 # Learn
 #AUTO_DEFINE _LEARN_ name(Learn) transforms((,newability[if type(*[lesson]|mysideboard)~morethan~0 then choice name(Put lesson in hand) name(Put lesson in hand) target(*[lesson]|mysideboard) moveto(myhand)],newability[if type(*|myhand)~morethan~0 then choice name(Discard and draw) name(Discard and draw) target(*|myhand) reject and!(draw:1)!],newability[if type(Retriever Phoenix|mygraveyard)~morethan~0 then choice name(Return a Retriever Phoenix) name(Return a Retriever Phoenix) target(Retriever Phoenix|mygraveyard) moveto(myBattlefield)],newability[choice name(Don't learn) donothing])) oneshot
 
-# Spectacle
+# Spectacle, not implemented
 #AUTO_DEFINE _SPECTACLE_($cost) compare(oplifelost)~morethan~0 {$cost}:
 
 # Extort
@@ -175,6 +175,9 @@ $AUTO_DEFINE _CLASH_ Put here a code if compare the casting cost based on Errati
 # Beast Token
 #AUTO_DEFINE _BEASTTOKEN_ create(Beast:Creature Beast:3/3:green)
 
+# Dragon Token
+#AUTO_DEFINE _DRAGONTOKEN_ create(Dragon:Creature Dragon:5/5:red:flying)
+
 # Elephant Token
 #AUTO_DEFINE _ELEPHANTTOKEN_ create(Elephant:Creature Elephant:3/3:green)
 
@@ -184,6 +187,9 @@ $AUTO_DEFINE _CLASH_ Put here a code if compare the casting cost based on Errati
 # Insect Token
 #AUTO_DEFINE _INSECTTOKEN_ create(Insect:Creature Insect:1/1:green)
 
+# Red Elemental Token
+#AUTO_DEFINE _REDELEMENTALTOKEN_ create(Elemental:Creature Elemental:1/1:red)
+
 # Saproling Token
 #AUTO_DEFINE _SAPROLINGTOKEN_ create(Saproling:creature Saproling:1/1:green)
 
@@ -192,6 +198,9 @@ $AUTO_DEFINE _CLASH_ Put here a code if compare the casting cost based on Errati
 
 # Spirit Token
 #AUTO_DEFINE _SPIRITTOKEN_ create(Spirit:creature Spirit:1/1:white:flying)
+
+# Thopter Token
+#AUTO_DEFINE _THOPTERTOKEN_ create(Thopter:Artifact Creature Thopter:1/1:flying)
  
 # Wolf Token
 #AUTO_DEFINE _WOLFTOKEN_ create(Wolf:creature Wolf:2/2:green)
diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index cbcd91655..423fb7e02 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -733,6 +733,7 @@ toughness=3
 name=Aetherstorm Roc
 abilities=flying
 auto=alterenergy:1 controller
+auto=@movedTo(other creature|myBattlefield):alterenergy:1 controller
 auto=_ATTACKING_pay({e:2}) counter(1/1) && tap(noevent) target(creature|opponentbattlefield)
 text=Flying -- Whenever Aetherstorm Roc or another creature enters the battlefield under your control, you get {E} (an energy counter). -- Whenever Aetherstorm Roc attacks, you may pay {E}{E}. If you do, put a +1/+1 counter on it and tap up to one target creature defending player controls.
 mana={2}{W}{W}
@@ -2917,7 +2918,7 @@ toughness=5
 name=Archfiend of Spite
 abilities=flying,madness
 autoexile=restriction{discarded} pay({3}{B}{B}) name(pay 3BB to cast) activate name(pay 2G to cast) castcard(normal)?name(put in graveyard) moveto(ownergraveyard)
-auto=_ENRAGE_life:-thatmuch opponent donothing'sacrifice notatarget(*|mybattlefield)!$ opponent
+auto=_ENRAGE_life:-thatmuch opponent donothing?sacrifice notatarget(*|mybattlefield)!$ opponent
 text=Flying -- Whenever a source an opponent controls deals damage to Archfiend of Spite, that source's controller loses that much life unless they sacrifice that many permanents. -- Madness {3}{B}{B} (If you discard this card, discard it into exile. When you do, cast it for its madness cost or put it into your graveyard.)
 mana={5}{B}{B}
 type=Creature
@@ -4390,7 +4391,7 @@ type=Sorcery
 [/card]
 [card]
 name=Awaken the Sky Tyrant
-auto=@damageof(player) from(*|opponentstack,opponentbattlefield,opponentgraveyard,opponenthand,opponentexile,opponentsideboard):may sacrifice && token(Dragon,Creature Dragon,5/5,red,flying) controller
+auto=@damageof(player) from(*|opponentstack,opponentbattlefield,opponentgraveyard,opponenthand,opponentexile,opponentsideboard):may sacrifice && _DRAGONTOKEN_ controller
 text=When a source an opponent controls deals damage to you, sacrifice Awaken the Sky Tyrant. If you do, create a 5/5 red Dragon creature token with flying.
 mana={3}{R}
 type=Enchantment
@@ -8392,7 +8393,7 @@ auto=cantattack
 auto=cantpwattack
 auto=cantblock
 auto=cantcrew
-auto=noactivatedability
+auto=onlymanaability
 text=Enchant permanent -- Enchanted permanent can't attack, block, or crew Vehicles, and its activated abilities can't be activated unless they're mana abilities.
 mana={2}{W}
 type=Enchantment
@@ -12072,6 +12073,8 @@ text=During your upkeep, roll a six-sided die. On a 6, sacrifice Chicken Egg and
 mana={1}{R}
 type=Creature
 subtype=Egg
+power=0
+toughness=1
 [/card]
 [card]
 name=Chicken a la King
@@ -18213,7 +18216,7 @@ type=Sorcery
 [/card]
 [card]
 name=Devastating Summons
-auto=if type(*[land]|myBattlefield)~morethan~0 then choice name(Sacrifice 1 land) ability$!sacrifice notatarget(land|mybattlefield)!$ controller && token(Elemental,Creature Elemental,1/1,red)*2
+auto=if type(*[land]|myBattlefield)~morethan~0 then choice name(Sacrifice 1 land) ability$!sacrifice notatarget(land|mybattlefield)!$ controller && _REDELEMENTALTOKEN_*2
 auto=if type(*[land]|myBattlefield)~morethan~1 then choice name(Sacrifice 2 lands) ability$!sacrifice notatarget(<2>land|mybattlefield)!$ controller && token(Elemental,Creature Elemental,2/2,red)*2
 auto=if type(*[land]|myBattlefield)~morethan~2 then choice name(Sacrifice 3 lands) ability$!sacrifice notatarget(<3>land|mybattlefield)!$ controller && token(Elemental,Creature Elemental,3/3,red)*2
 auto=if type(*[land]|myBattlefield)~morethan~3 then choice name(Sacrifice 4 lands) ability$!sacrifice notatarget(<4>land|mybattlefield)!$ controller && token(Elemental,Creature Elemental,4/4,red)*2
@@ -19674,7 +19677,7 @@ auto={T}:Add{U}
 auto={T}:Add{B}
 auto={T}:Add{R}
 auto={T}:Add{G}
-auto={7}{T}{S}:create(dragon:creature dragon:5/5:red:flying)
+auto={7}{T}{S}:_DRAGONTOKEN_
 text={T}: Add one mana of any color. -- {7}, {T}, Sacrifice Draconic Disciple: Create a 5/5 red Dragon creature token with flying.
 mana={1}{R}{G}
 type=Creature
@@ -19874,11 +19877,11 @@ toughness=3
 [card]
 name=Dragonkin Berserker
 abilities=boast,first strike
-auto={4}{R} restriction{didattack,compare(hascntbstreduce)~equalto~0}:doboast && token(Dragon,Creature Dragon,5/5,red,flying) limit:hasabilitytwoboastplus1plusend
-auto={3}{R} restriction{didattack,compare(hascntbstreduce)~equalto~1}:doboast && token(Dragon,Creature Dragon,5/5,red,flying) limit:hasabilitytwoboastplus1plusend
-auto={2}{R} restriction{didattack,compare(hascntbstreduce)~equalto~2}:doboast && token(Dragon,Creature Dragon,5/5,red,flying) limit:hasabilitytwoboastplus1plusend
-auto={1}{R} restriction{didattack,compare(hascntbstreduce)~equalto~3}:doboast && token(Dragon,Creature Dragon,5/5,red,flying) limit:hasabilitytwoboastplus1plusend
-auto={R} restriction{didattack,compare(hascntbstreduce)~morethan~3}:doboast && token(Dragon,Creature Dragon,5/5,red,flying) limit:hasabilitytwoboastplus1plusend
+auto={4}{R} restriction{didattack,compare(hascntbstreduce)~equalto~0}:doboast && _DRAGONTOKEN_ limit:hasabilitytwoboastplus1plusend
+auto={3}{R} restriction{didattack,compare(hascntbstreduce)~equalto~1}:doboast && _DRAGONTOKEN_ limit:hasabilitytwoboastplus1plusend
+auto={2}{R} restriction{didattack,compare(hascntbstreduce)~equalto~2}:doboast && _DRAGONTOKEN_ limit:hasabilitytwoboastplus1plusend
+auto={1}{R} restriction{didattack,compare(hascntbstreduce)~equalto~3}:doboast && _DRAGONTOKEN_ limit:hasabilitytwoboastplus1plusend
+auto={R} restriction{didattack,compare(hascntbstreduce)~morethan~3}:doboast && _DRAGONTOKEN_ limit:hasabilitytwoboastplus1plusend
 auto=foreach(dragon|mybattlefield) counter(0/0,1,MyEffect)
 auto=foreach(dragon|mybattlefield) all(*[boast]|mybattlefield) counter(0/0,1,BstReduce)
 auto=@movedTo(*[boast]|mybattlefield):foreach(dragon|mybattlefield) all(trigger[to]) counter(0/0,1,BstReduce)
@@ -20153,8 +20156,8 @@ toughness=3
 [/card]
 [card]
 name=Dread Summons
-auto=deplete:X opponent && deplete:X controller
 auto=@movedTo(creature|graveyard) from(library):all(trigger[to]) (_ZOMBIETOKEN_ tap(noevent)) controller)!
+auto=deplete:X opponent && deplete:X controller
 text=Each player puts the top X cards of their library into their graveyard. For each creature card put into a graveyard this way, you create a tapped 2/2 black Zombie creature token.
 mana={X}{B}{B}
 type=Sorcery
@@ -24001,8 +24004,8 @@ type=Instant
 [/card]
 [card]
 name=Fade Away
-auto=foreach(creature|myBattlefield) transforms((,newability[pay[[{1}]] name(pay 1 mana) donothing'sacrifice target(*|mybattlefield) controller]))
-auto=foreach(creature|opponentBattlefield) transforms((,newability[pay[[{1}]] name(pay 1 mana) donothing'sacrifice target(*|mybattlefield) opponent]))
+auto=foreach(creature|myBattlefield) transforms((,newability[pay[[{1}]] name(pay 1 mana) donothing?sacrifice target(*|mybattlefield) controller]))
+auto=foreach(creature|opponentBattlefield) transforms((,newability[pay[[{1}]] name(pay 1 mana) donothing?sacrifice target(*|mybattlefield) opponent]))
 text=For each creature, its controller sacrifices a permanent unless he or she pays {1}.
 mana={2}{U}
 type=Sorcery
@@ -39516,7 +39519,7 @@ toughness=5
 [card]
 name=Kefnet's Last Word
 target=artifact,creature,enchantment
-auto=1194
+auto=moveto(mybattlefield)
 auto=all(land|mybattlefield) frozen
 text=Gain control of target artifact, creature, or enchantment. Lands you control don't untap during your next untap step.
 mana={2}{U}{U}
@@ -41506,7 +41509,7 @@ toughness=2
 [card]
 name=Lathliss, Dragon Queen
 abilities=flying
-auto=@movedTo(Dragon[-token]|myBattlefield):create(dragon:creature dragon:5/5:red:flying)
+auto=@movedTo(Dragon[-token]|myBattlefield):_DRAGONTOKEN_
 auto={1}{R}:all(dragon|myBattlefield)) 1/0 ueot
 text=Flying -- Whenever another nontoken Dragon enters the battlefield under your control, create a 5/5 red Dragon creature token with flying. -- {1}{R}: Dragons you control get +1/+0 until end of turn.
 mana={4}{R}{R}
@@ -42825,9 +42828,10 @@ subtype=Aura
 name=Lithoform Engine
 #auto={2}{T}:No copy for triggered abilities ATM...
 auto={3}{T}:name(Copy target instant or sorcery) target(*[instant;sorcery]|myStack) castcard(copied noevent)
-auto={4}{T}:name(Copy target permanent spell) clone target(*|myBattlefield)
+auto={4}{T}:name(Copy target permanent spell) target(*[-instant;-sorcery]|myStack) castcard(copied noevent)
 text={2},{T}: Copy target activated or triggered ability you control. You may choose new targets for the copy. -- {3},{T}: Copy target instant or sorcery spell you control. You may choose new targets for the copy. -- {4},{T}: Copy target permanent spell you control. (the copy becomes a token.)
 type=Legendary Artifact
+mana={4}
 [/card]
 [card]
 name=Littjara Glade-Warden
@@ -45142,7 +45146,7 @@ subtype=Equipment
 [/card]
 [card]
 name=Mask of Immolation
-auto=livingweapontoken(Elemental,Creature Elemental,1/1,red)
+auto=livingweapon_REDELEMENTALTOKEN_
 auto={2}:equip
 auto=teach(creature) {S}:damage:1 target(player,creature,planeswalker)
 text=When Mask of Immolation enters the battlefield, create a 1/1 red Elemental creature token, then attach Mask of Immolation to it. -- Equipped creature has "Sacrifice this creature: It deals 1 damage to any target." -- Equip {2} ({2} : Attach to target creature you control. Equip only as a sorcery.)
@@ -45882,7 +45886,7 @@ toughness=5
 [/card]
 [card]
 name=Metalworker
-auto={T}:target(<anyamount>[artifact]|myhand) transforms((,newability[foreach(artifact|reveal) add: {2}]))
+auto={T}:foreach(artifact|myhand) add:{2}
 text={T}: Reveal any number of artifact cards in your hand. Add {C}{C} for each card revealed this way.
 mana={3}
 type=Artifact Creature
@@ -46010,7 +46014,8 @@ name=Midnight Clock
 auto={T}:add{1}
 auto={2}{U}:counter(0/0,1,hour)
 auto=@each upkeep:counter(0/0,1,hour)
-auto={C(0/0,12,hour)}{E}:moveto(myLibrary) all(*|myGraveyard) && moveto(myLibrary) all(*|myHand) && shuffle && draw:7 controller
+auto=@counteradded(0/0,1,hour) from(this):this(counter{0/0.12.hour}) moveTo(exile) all(this)
+auto=@counteradded(0/0,1,hour) from(this):this(counter{0/0.12.hour}) moveto(myLibrary) all(*|myGraveyard) && moveto(myLibrary) all(*|myHand) && shuffle && draw:7 controller
 text={T}: Add {U}. -- {2}{U}: Put an hour counter on Midnight Clock. -- At the beginning of each upkeep, put an hour counter on Midnight Clock. -- When the twelfth hour counter is put on Midnight Clock, shuffle your hand and graveyard into your library, then draw seven cards. Exile Midnight Clock.
 mana={2}{U}
 type=Artifact
@@ -46886,7 +46891,7 @@ toughness=2
 [/card]
 [card]
 name=Molten Birth
-auto=token(Elemental,Creature Elemental,1/1,red)*2
+auto=_REDELEMENTALTOKEN_*2
 auto=flipacoin winability moveto(myhand) all(this) winabilityend flipend
 text=Put two 1/1 red Elemental creature tokens onto the battlefield. Then flip a coin. If you win the flip, return Molten Birth to its owner's hand.
 mana={1}{R}{R}
@@ -51094,7 +51099,7 @@ toughness=2
 [card]
 name=Orcish Hellraiser
 auto=counter(0/0,1,echo)
-auto=@each my upkeep once:transforms((,newability[counter(0/0.-1.echo)],newability[pay[[{R}]] name(pay red mana) donothing'sacrifice])) forever
+auto=@each my upkeep once:transforms((,newability[counter(0/0.-1.echo)],newability[pay[[{R}]] name(pay red mana) donothing?sacrifice])) forever
 auto=_DIES_name(Deals 2 damage) damage:2 target(player,planeswalker)
 text=Echo {R} (At the beginning of your upkeep, if this came under your control since the beginning of your last upkeep, sacrifice it unless you pay its echo cost.) -- When Orcish Hellraiser dies, it deals 2 damage to target player or planeswalker.
 mana={1}{R}
@@ -52615,7 +52620,7 @@ toughness=1
 [card]
 name=Pendrell Flux
 target=creature
-auto=teach(creature) transforms((,newability[@each my upkeep:thisforeach(variable{manacost}) pay[[{1}]] name(pay manacost) donothing'sacrifice])) forever
+auto=teach(creature) transforms((,newability[@each my upkeep:thisforeach(variable{manacost}) pay[[{1}]] name(pay manacost) donothing?sacrifice])) forever
 text=Enchant creature -- Enchanted creature has "At the beginning of your upkeep, sacrifice this creature unless you pay its mana cost."
 mana={1}{U}
 type=Enchantment
@@ -53341,7 +53346,7 @@ toughness=5
 [/card]
 [card]
 name=Pithing Needle
-auto=chooseanameopp lord(*[chosenname]) noactivatedability chooseend
+auto=chooseanameopp lord(*[chosenname]) onlymanaability chooseend
 text=As Pithing Needle enters the battlefield, name a card. -- Activated abilities of sources with the chosen name can't be activated unless they're mana abilities.
 mana={1}
 type=Artifact
@@ -53894,8 +53899,8 @@ toughness=5
 [/card]
 [card]
 name=Pondering Mage
-aicode=name(look) activate name(look) transforms((,newability[foreach(*[zpos<=4]|mylibrary) moverandom(*[zpos<=4]) from(mylibrary) to(mylibrary)],newability[draw:1])) ueot
-auto=name(Look) reveal:3 optionone name(Look) target(*|reveal) doNothing optiononeend optiontwo target(<3>*|reveal) moveto(mylibrary)  optiontwoend afterrevealed transforms((,newability[choice shuffle && draw:1],newability[choice name(Cancel) draw:1])) afterrevealedend revealend
+aicode=name(look) activate name(look) transforms((,newability[foreach(*[zpos<=3]|mylibrary) moverandom(*[zpos<=3]) from(mylibrary) to(mylibrary)],newability[draw:1])) ueot
+auto=name(Look) reveal:3 optionone name(Look) target(*|reveal) doNothing optiononeend optiontwo target(<3>*|reveal) moveto(mylibrary) optiontwoend afterrevealed transforms((,newability[draw:1],newability[may shuffle])) oneshot afterrevealedend revealend
 text=When Pondering Mage enters the battlefield, look at the top three cards of your library, then put them back in any order. You may shuffle your library. Draw a card.
 mana={3}{U}{U}
 type=Creature
@@ -61989,7 +61994,7 @@ toughness=4
 [/card]
 [card]
 name=Scampering Scorcher
-auto=token(Elemental,Creature Elemental,1/1,red)*2
+auto=_REDELEMENTALTOKEN_*2
 auto=lord(creature[elemental]|myBattlefield) haste
 text=When Scampering Scorcher enters the battlefield, create two 1/1 red Elemental creature tokens. Elementals you control gain haste until end of turn. (They can attack and {T} this turn.)
 mana={3}{R}
@@ -62797,7 +62802,7 @@ toughness=1
 [card]
 name=Seasoned Pyromancer
 auto=ability$!name(Discard and draw) name(Discard and draw) target(<2>*|myhand) reject and!( transforms((,newability[draw:1 controller],newability[if cantargetcard(*[-land]|*) then token(Elemental^Creature Elemental^1/1^red)])) oneshot )! !$ controller
-autograveyard={3}{R}{R}{E}:token(Elemental,creature Elemental,1/1,red)*2
+autograveyard={3}{R}{R}{E}:_REDELEMENTALTOKEN_*2
 text=When Seasoned Pyromancer enters the battlefield, discard two cards, then draw two cards. For each nonland card discarded this way, create a 1/1 red Elemental creature token. -- {3}{R}{R}, Exile Seasoned Pyromancer from your graveyard: Create two 1/1 red Elemental creature tokens.
 mana={1}{R}{R}
 type=Creature
@@ -66347,7 +66352,7 @@ toughness=2
 name=Skyline Despot
 abilities=flying
 auto=_MONARCH_CONTROLLER_
-auto=@each my upkeep restriction{compare(pmonarch)~morethan~0}:token(Dragon,Creature Dragon,5/5,red,flying)
+auto=@each my upkeep restriction{compare(pmonarch)~morethan~0}:_DRAGONTOKEN_
 text=Flying -- When Skyline Despot enters the battlefield, you become the monarch. -- At the beginning of your upkeep, if you're the monarch, put a 5/5 red Dragon creature token with flying onto the battlefield.
 mana={5}{R}{R}
 type=Creature
@@ -66770,8 +66775,8 @@ type=Instant
 [card]
 name=Smell Fear
 target=creature|myBattlefield
-auto=transforms((,newability[target(creature|opponentBattlefield) dynamicability<!powerstrike eachother!>])) oneshot
 auto=_PROLIFERATE_
+auto=transforms((,newability[target(creature|opponentBattlefield) dynamicability<!powerstrike eachother!>])) oneshot
 text=Proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.) -- Target creature you control fights up to one target creature you don't control.
 mana={1}{G}
 type=Sorcery
@@ -66877,7 +66882,7 @@ toughness=4
 [/card]
 [card]
 name=Smothering Tithe
-auto=@drawfoeof(player):ability$!name(pay or create treasure) pay[[{2}]] donothing'token(Treasure Sur) opponent!$ opponent
+auto=@drawfoeof(player):ability$!name(pay or create treasure) pay[[{2}]] donothing?token(Treasure Sur) opponent!$ opponent
 text=Whenever an opponent draws a card, that player may pay {2} . If the player doesn't, you create a Treasure token. (It's an artifact with " {T}, Sacrifice this artifact: Add one mana of any color.")
 mana={3}{W}
 type=Enchantment
@@ -67456,7 +67461,7 @@ subtype=Equipment
 [/card]
 [card]
 name=Sorcerous Spyglass
-auto=name(Look opponent hand) target(*|opponenthand) moveto(opponenthand) and!( chooseanameopp lord(*[chosenname]) noactivatedability chooseend )!
+auto=name(Look opponent hand) target(*|opponenthand) moveto(opponenthand) and!( chooseanameopp lord(*[chosenname]) onlymanaability chooseend )!
 text=As Sorcerous Spyglass enters the battlefield, look at an opponent's hand, then choose any card name. -- Activated abilities of sources with the chosen name can't be activated unless they're mana abilities.
 mana={2}
 type=Artifact
@@ -70145,7 +70150,7 @@ toughness=3
 [/card]
 [card]
 name=Stolen Strategy
-auto=@each my upkeep:all(*[zpos=1]|opponentlibrary) moveto(myexile) and!( transforms((,newability[canplayfromexile],newability[anytypeofmana],newability[phaseaction[endofturn once] moveTo(ownerexile)])) ueot )!
+auto=@each my upkeep:all(*[zpos=1]|opponentlibrary) moveto(myexile) and!( transforms((,newability[canplayfromexile],newability[anytypeofmana])) ueot )!
 text=At the beginning of your upkeep, exile the top card of each opponent's library. Until end of turn, you may cast spells from among those exiled cards, and you may spend mana as though it were mana of any color to cast those spells.
 mana={4}{R}
 type=Enchantment
@@ -71864,8 +71869,8 @@ name=Sword of Sinew and Steel
 auto=teach(creature) 2/2
 auto=teach(creature) protection from black
 auto=teach(creature) protection from red
-auto=@combatdamaged(player) from(mytgt):may destroy target(planeswalker)
-auto=@combatdamaged(player) from(mytgt):may destroy target(artifact)
+auto=@combatdamaged(player) from(mytgt):may name(destroy planeswalker) destroy target(planeswalker)
+auto=@combatdamaged(player) from(mytgt):may name(destroy artifact) destroy target(artifact)
 auto={2}:equip
 text=Equipped creature gets +2/+2 and has protection from black and from red. -- Whenever equipped creature deals combat damage to a player, destroy up to one target planeswalker and up to one target artifact. -- Equip {2}
 mana={3}
@@ -72704,48 +72709,48 @@ toughness=1
 [/card]
 [card]
 name=Tariff
-auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~0 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=0]|mybattlefield) transforms((,newability[pay[[{0}]] name(pay 0 mana) donothing'sacrifice])) oneshot!$ opponent
-auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~0 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=0]|mybattlefield) transforms((,newability[pay[[{0}]] name(pay 0 mana) donothing'sacrifice])) oneshot!$ controller
-auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~1 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=1]|mybattlefield) transforms((,newability[pay[[{1}]] name(pay 1 mana) donothing'sacrifice])) oneshot!$ opponent
-auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~1 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=1]|mybattlefield) transforms((,newability[pay[[{1}]] name(pay 1 mana) donothing'sacrifice])) oneshot!$ controller
-auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~2 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=2]|mybattlefield) transforms((,newability[pay[[{2}]] name(pay 2 mana) donothing'sacrifice])) oneshot!$ opponent
-auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~2 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=2]|mybattlefield) transforms((,newability[pay[[{2}]] name(pay 2 mana) donothing'sacrifice])) oneshot!$ controller
-auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~3 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=3]|mybattlefield) transforms((,newability[pay[[{3}]] name(pay 3 mana) donothing'sacrifice])) oneshot!$ opponent
-auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~3 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=3]|mybattlefield) transforms((,newability[pay[[{3}]] name(pay 3 mana) donothing'sacrifice])) oneshot!$ controller
-auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~4 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=4]|mybattlefield) transforms((,newability[pay[[{4}]] name(pay 4 mana) donothing'sacrifice])) oneshot!$ opponent
-auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~4 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=4]|mybattlefield) transforms((,newability[pay[[{4}]] name(pay 4 mana) donothing'sacrifice])) oneshot!$ controller
-auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~5 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=5]|mybattlefield) transforms((,newability[pay[[{5}]] name(pay 5 mana) donothing'sacrifice])) oneshot!$ opponent
-auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~5 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=5]|mybattlefield) transforms((,newability[pay[[{5}]] name(pay 5 mana) donothing'sacrifice])) oneshot!$ controller
-auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~6 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=6]|mybattlefield) transforms((,newability[pay[[{6}]] name(pay 6 mana) donothing'sacrifice])) oneshot!$ opponent
-auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~6 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=6]|mybattlefield) transforms((,newability[pay[[{6}]] name(pay 6 mana) donothing'sacrifice])) oneshot!$ controller
-auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~7 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=7]|mybattlefield) transforms((,newability[pay[[{7}]] name(pay 7 mana) donothing'sacrifice])) oneshot!$ opponent
-auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~7 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=7]|mybattlefield) transforms((,newability[pay[[{7}]] name(pay 7 mana) donothing'sacrifice])) oneshot!$ controller
-auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~8 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=8]|mybattlefield) transforms((,newability[pay[[{8}]] name(pay 8 mana) donothing'sacrifice])) oneshot!$ opponent
-auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~8 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=8]|mybattlefield) transforms((,newability[pay[[{8}]] name(pay 8 mana) donothing'sacrifice])) oneshot!$ controller
-auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~9 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=9]|mybattlefield) transforms((,newability[pay[[{9}]] name(pay 9 mana) donothing'sacrifice])) oneshot!$ opponent
-auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~9 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=9]|mybattlefield) transforms((,newability[pay[[{9}]] name(pay 9 mana) donothing'sacrifice])) oneshot!$ controller
-auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~10 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=10]|mybattlefield) transforms((,newability[pay[[{10}]] name(pay 10 mana) donothing'sacrifice])) oneshot!$ opponent
-auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~10 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=10]|mybattlefield) transforms((,newability[pay[[{10}]] name(pay 10 mana) donothing'sacrifice])) oneshot!$ controller
-auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~11 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=11]|mybattlefield) transforms((,newability[pay[[{11}]] name(pay 11 mana) donothing'sacrifice])) oneshot!$ opponent
-auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~11 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=11]|mybattlefield) transforms((,newability[pay[[{11}]] name(pay 11 mana) donothing'sacrifice])) oneshot!$ controller
-auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~12 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=12]|mybattlefield) transforms((,newability[pay[[{12}]] name(pay 12 mana) donothing'sacrifice])) oneshot!$ opponent
-auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~12 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=12]|mybattlefield) transforms((,newability[pay[[{12}]] name(pay 12 mana) donothing'sacrifice])) oneshot!$ controller
-auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~13 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=13]|mybattlefield) transforms((,newability[pay[[{13}]] name(pay 13 mana) donothing'sacrifice])) oneshot!$ opponent
-auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~13 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=13]|mybattlefield) transforms((,newability[pay[[{13}]] name(pay 13 mana) donothing'sacrifice])) oneshot!$ controller
-auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~14 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=14]|mybattlefield) transforms((,newability[pay[[{14}]] name(pay 14 mana) donothing'sacrifice])) oneshot!$ opponent
-auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~14 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=14]|mybattlefield) transforms((,newability[pay[[{14}]] name(pay 14 mana) donothing'sacrifice])) oneshot!$ controller
-auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~15 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=15]|mybattlefield) transforms((,newability[pay[[{15}]] name(pay 15 mana) donothing'sacrifice])) oneshot!$ opponent
-auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~15 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=15]|mybattlefield) transforms((,newability[pay[[{15}]] name(pay 15 mana) donothing'sacrifice])) oneshot!$ controller
-auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~16 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=16]|mybattlefield) transforms((,newability[pay[[{16}]] name(pay 16 mana) donothing'sacrifice])) oneshot!$ opponent
-auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~16 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=16]|mybattlefield) transforms((,newability[pay[[{16}]] name(pay 16 mana) donothing'sacrifice])) oneshot!$ controller
-auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~17 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=17]|mybattlefield) transforms((,newability[pay[[{17}]] name(pay 17 mana) donothing'sacrifice])) oneshot!$ opponent
-auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~17 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=17]|mybattlefield) transforms((,newability[pay[[{17}]] name(pay 17 mana) donothing'sacrifice])) oneshot!$ controller
-auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~18 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=18]|mybattlefield) transforms((,newability[pay[[{18}]] name(pay 18 mana) donothing'sacrifice])) oneshot!$ opponent
-auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~18 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=18]|mybattlefield) transforms((,newability[pay[[{18}]] name(pay 18 mana) donothing'sacrifice])) oneshot!$ controller
-auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~19 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=19]|mybattlefield) transforms((,newability[pay[[{19}]] name(pay 19 mana) donothing'sacrifice])) oneshot!$ opponent
-auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~19 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=19]|mybattlefield) transforms((,newability[pay[[{19}]] name(pay 19 mana) donothing'sacrifice])) oneshot!$ controller
-auto=if compare(convertedcost:highest:creature:opponentbattlefield)~morethan~19 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost>=20]|mybattlefield) transforms((,newability[pay[[{20}]] name(pay 20 mana) donothing'sacrifice])) oneshot!$ opponent
-auto=if compare(convertedcost:highest:creature:mybattlefield)~morethan~19 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost>=20]|mybattlefield) transforms((,newability[pay[[{20}]] name(pay 20 mana) donothing'sacrifice])) oneshot!$ controller
+auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~0 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=0]|mybattlefield) transforms((,newability[pay[[{0}]] name(pay 0 mana) donothing?sacrifice])) oneshot!$ opponent
+auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~0 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=0]|mybattlefield) transforms((,newability[pay[[{0}]] name(pay 0 mana) donothing?sacrifice])) oneshot!$ controller
+auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~1 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=1]|mybattlefield) transforms((,newability[pay[[{1}]] name(pay 1 mana) donothing?sacrifice])) oneshot!$ opponent
+auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~1 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=1]|mybattlefield) transforms((,newability[pay[[{1}]] name(pay 1 mana) donothing?sacrifice])) oneshot!$ controller
+auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~2 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=2]|mybattlefield) transforms((,newability[pay[[{2}]] name(pay 2 mana) donothing?sacrifice])) oneshot!$ opponent
+auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~2 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=2]|mybattlefield) transforms((,newability[pay[[{2}]] name(pay 2 mana) donothing?sacrifice])) oneshot!$ controller
+auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~3 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=3]|mybattlefield) transforms((,newability[pay[[{3}]] name(pay 3 mana) donothing?sacrifice])) oneshot!$ opponent
+auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~3 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=3]|mybattlefield) transforms((,newability[pay[[{3}]] name(pay 3 mana) donothing?sacrifice])) oneshot!$ controller
+auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~4 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=4]|mybattlefield) transforms((,newability[pay[[{4}]] name(pay 4 mana) donothing?sacrifice])) oneshot!$ opponent
+auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~4 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=4]|mybattlefield) transforms((,newability[pay[[{4}]] name(pay 4 mana) donothing?sacrifice])) oneshot!$ controller
+auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~5 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=5]|mybattlefield) transforms((,newability[pay[[{5}]] name(pay 5 mana) donothing?sacrifice])) oneshot!$ opponent
+auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~5 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=5]|mybattlefield) transforms((,newability[pay[[{5}]] name(pay 5 mana) donothing?sacrifice])) oneshot!$ controller
+auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~6 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=6]|mybattlefield) transforms((,newability[pay[[{6}]] name(pay 6 mana) donothing?sacrifice])) oneshot!$ opponent
+auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~6 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=6]|mybattlefield) transforms((,newability[pay[[{6}]] name(pay 6 mana) donothing?sacrifice])) oneshot!$ controller
+auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~7 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=7]|mybattlefield) transforms((,newability[pay[[{7}]] name(pay 7 mana) donothing?sacrifice])) oneshot!$ opponent
+auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~7 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=7]|mybattlefield) transforms((,newability[pay[[{7}]] name(pay 7 mana) donothing?sacrifice])) oneshot!$ controller
+auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~8 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=8]|mybattlefield) transforms((,newability[pay[[{8}]] name(pay 8 mana) donothing?sacrifice])) oneshot!$ opponent
+auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~8 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=8]|mybattlefield) transforms((,newability[pay[[{8}]] name(pay 8 mana) donothing?sacrifice])) oneshot!$ controller
+auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~9 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=9]|mybattlefield) transforms((,newability[pay[[{9}]] name(pay 9 mana) donothing?sacrifice])) oneshot!$ opponent
+auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~9 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=9]|mybattlefield) transforms((,newability[pay[[{9}]] name(pay 9 mana) donothing?sacrifice])) oneshot!$ controller
+auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~10 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=10]|mybattlefield) transforms((,newability[pay[[{10}]] name(pay 10 mana) donothing?sacrifice])) oneshot!$ opponent
+auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~10 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=10]|mybattlefield) transforms((,newability[pay[[{10}]] name(pay 10 mana) donothing?sacrifice])) oneshot!$ controller
+auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~11 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=11]|mybattlefield) transforms((,newability[pay[[{11}]] name(pay 11 mana) donothing?sacrifice])) oneshot!$ opponent
+auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~11 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=11]|mybattlefield) transforms((,newability[pay[[{11}]] name(pay 11 mana) donothing?sacrifice])) oneshot!$ controller
+auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~12 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=12]|mybattlefield) transforms((,newability[pay[[{12}]] name(pay 12 mana) donothing?sacrifice])) oneshot!$ opponent
+auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~12 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=12]|mybattlefield) transforms((,newability[pay[[{12}]] name(pay 12 mana) donothing?sacrifice])) oneshot!$ controller
+auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~13 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=13]|mybattlefield) transforms((,newability[pay[[{13}]] name(pay 13 mana) donothing?sacrifice])) oneshot!$ opponent
+auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~13 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=13]|mybattlefield) transforms((,newability[pay[[{13}]] name(pay 13 mana) donothing?sacrifice])) oneshot!$ controller
+auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~14 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=14]|mybattlefield) transforms((,newability[pay[[{14}]] name(pay 14 mana) donothing?sacrifice])) oneshot!$ opponent
+auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~14 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=14]|mybattlefield) transforms((,newability[pay[[{14}]] name(pay 14 mana) donothing?sacrifice])) oneshot!$ controller
+auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~15 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=15]|mybattlefield) transforms((,newability[pay[[{15}]] name(pay 15 mana) donothing?sacrifice])) oneshot!$ opponent
+auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~15 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=15]|mybattlefield) transforms((,newability[pay[[{15}]] name(pay 15 mana) donothing?sacrifice])) oneshot!$ controller
+auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~16 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=16]|mybattlefield) transforms((,newability[pay[[{16}]] name(pay 16 mana) donothing?sacrifice])) oneshot!$ opponent
+auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~16 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=16]|mybattlefield) transforms((,newability[pay[[{16}]] name(pay 16 mana) donothing?sacrifice])) oneshot!$ controller
+auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~17 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=17]|mybattlefield) transforms((,newability[pay[[{17}]] name(pay 17 mana) donothing?sacrifice])) oneshot!$ opponent
+auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~17 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=17]|mybattlefield) transforms((,newability[pay[[{17}]] name(pay 17 mana) donothing?sacrifice])) oneshot!$ controller
+auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~18 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=18]|mybattlefield) transforms((,newability[pay[[{18}]] name(pay 18 mana) donothing?sacrifice])) oneshot!$ opponent
+auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~18 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=18]|mybattlefield) transforms((,newability[pay[[{18}]] name(pay 18 mana) donothing?sacrifice])) oneshot!$ controller
+auto=if compare(convertedcost:highest:creature:opponentbattlefield)~equalto~19 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=19]|mybattlefield) transforms((,newability[pay[[{19}]] name(pay 19 mana) donothing?sacrifice])) oneshot!$ opponent
+auto=if compare(convertedcost:highest:creature:mybattlefield)~equalto~19 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost=19]|mybattlefield) transforms((,newability[pay[[{19}]] name(pay 19 mana) donothing?sacrifice])) oneshot!$ controller
+auto=if compare(convertedcost:highest:creature:opponentbattlefield)~morethan~19 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost>=20]|mybattlefield) transforms((,newability[pay[[{20}]] name(pay 20 mana) donothing?sacrifice])) oneshot!$ opponent
+auto=if compare(convertedcost:highest:creature:mybattlefield)~morethan~19 then ability$!name(Sacrifice a creature) name(Sacrifice a creature) target(creature[manacost>=20]|mybattlefield) transforms((,newability[pay[[{20}]] name(pay 20 mana) donothing?sacrifice])) oneshot!$ controller
 text=Each player sacrifices the creature he or she controls with the highest mana value unless he or she pays that creature's mana cost. If two creatures a player controls are tied for highest cost, that player chooses one.
 mana={1}{W}
 type=Sorcery
@@ -72905,8 +72910,8 @@ subtype=Lesson
 [/card]
 [card]
 name=Team Pennant
+auto=name(Equip creature token) {1}:rehook  target(creature[token]|mybattlefield)
 auto={3}:equip
-auto={1}:rehook target(creature[token]|mybattlefield)
 auto=teach(creature) 1/1
 auto=teach(creature) vigilance
 auto=teach(creature) trample
@@ -75870,7 +75875,7 @@ type=Sorcery
 [card]
 name=Torment of Scarabs
 target=player
-auto=@each targetedplayer upkeep:ability$!pay[[{L:3}]] name(pay or sacrifice) donothing'sacrifice notatarget(*[-land]|mybattlefield)!$ targetedplayer
+auto=@each targetedplayer upkeep:ability$!pay[[{L:3}]] name(pay or sacrifice) donothing?sacrifice notatarget(*[-land]|mybattlefield)!$ targetedplayer
 text=Enchant player -- At the beginning of enchanted player's upkeep, that player loses 3 life unless he or she sacrifices a nonland permanent or discards a card.
 mana={3}{B}
 type=Enchantment
@@ -75880,7 +75885,7 @@ subtype=Aura Curse
 name=Torment of Venom
 target=creature
 auto=counter(-1/-1,3)
-auto=ability$!pay[[{L:3}]] name(pay or sacrifice) donothing'sacrifice notatarget(*[-land]|mybattlefield)!$ opponent
+auto=ability$!pay[[{L:3}]] name(pay or sacrifice) donothing?sacrifice notatarget(*[-land]|mybattlefield)!$ opponent
 text=Put three -1/-1 counters on target creature. Its controller loses 3 life unless he or she sacrifices another nonland permanent or discards a card.
 mana={2}{B}{B}
 type=Instant
@@ -82116,7 +82121,7 @@ type=Sorcery
 name=Wild Might
 target=creature
 auto=1/1 ueot
-auto=ability$!name(pay or 4/4) pay[[{2}]] name(pay 2 mana) donothing'target(creature|opponentbattlefield) 4/4 ueot!$ opponent
+auto=ability$!name(pay or 4/4) pay[[{2}]] name(pay 2 mana) donothing?target(creature|opponentbattlefield) 4/4 ueot!$ opponent
 text=Target creature gets +1/+1 until end of turn. That creature gets an additional +4/+4 until end of turn unless any player pays {2}.
 mana={1}{G}
 type=Instant
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index e28bc01fb..90dde06fb 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -2013,7 +2013,7 @@ toughness=1
 [card]
 name=Akki Blizzard-Herder
 auto=_DIES_ability$!sacrifice notatarget(land|mybattlefield)!$ controller && ability$!sacrifice notatarget(land|mybattlefield)!$ opponent
-text=When Akki Blizzard-Herder is put into a graveyard from the battlefield, each player sacrifices a land.
+text=When Akki Blizzard-Herder dies, each player sacrifices a land.
 mana={1}{R}
 type=Creature
 subtype=Goblin Shaman
@@ -11105,7 +11105,7 @@ type=Sorcery
 name=Blade of the Bloodchief
 auto={1}:equip
 auto=@movedto(creature|graveyard) from(creature|battlefield):counter(1/1) && if cantargetcard(vampire) then counter(1/1)
-text=Whenever a creature is put into a graveyard from the battlefield, put a +1/+1 counter on equipped creature. If equipped creature is a Vampire, put two +1/+1 counters on it instead. -- Equip {1}
+text=Whenever a creature dies, put a +1/+1 counter on equipped creature. If equipped creature is a Vampire, put two +1/+1 counters on it instead. -- Equip {1}
 mana={1}
 type=Artifact
 subtype=Equipment
@@ -15850,7 +15850,7 @@ toughness=2
 [card]
 name=Burning Sands
 auto=lord(creature) transforms((,newability[@movedto(graveyard) from(this|mybattlefield):target(land|mybattlefield) sacrifice]))
-text=Whenever a creature is put into a graveyard from the battlefield, that creature's controller sacrifices a land.
+text=Whenever a creature dies, that creature's controller sacrifices a land.
 mana={3}{R}{R}
 type=Enchantment
 [/card]
@@ -16388,8 +16388,8 @@ toughness=4
 [/card]
 [card]
 name=Caldera Hellion
-auto=may target(<anyamount>other creature|mybattlefield) sacrifice && counter(1/1) all(this)
 auto=all(creature) damage:3
+auto=may target(<anyamount>other creature|mybattlefield) sacrifice && counter(1/1) all(this)
 text=Devour 1 (As this enters the battlefield, you may sacrifice any number of creatures. This creature enters the battlefield with that many +1/+1 counters on it.) -- When Caldera Hellion enters the battlefield, it deals 3 damage to each creature.
 mana={3}{R}{R}
 type=Creature
@@ -18045,7 +18045,7 @@ toughness=5
 [card]
 name=Cemetery Puca
 auto=@movedto(creature|graveyard) from(battlefield):all(trigger[from]) pay[[{1}]] copy
-text=Whenever a creature is put into a graveyard from the battlefield, you may pay {1}. If you do, Cemetery Puca becomes a copy of that creature and gains this ability.
+text=Whenever a creature dies, you may pay {1}. If you do, Cemetery Puca becomes a copy of that creature and gains this ability.
 mana={1}{UB}{UB}
 type=Creature
 subtype=Shapeshifter
@@ -26649,7 +26649,7 @@ type=Sorcery
 [/card]
 [card]
 name=Day of the Dragons
-auto=all(creature|mybattlefield) (blink)forsrc && foreach(creature|mybattlefield) token(Dragon,creature dragon, 5/5,flying red)*1
+auto=all(creature|mybattlefield) (blink)forsrc && foreach(creature|mybattlefield) _DRAGONTOKEN_
 auto=@movedto(this|nonbattlezone):sacrifice all(creature[dragon]|mybattlefield)
 text=When Day of the Dragons enters the battlefield, exile all creatures you control. Then put that many 5/5 red Dragon creature tokens with flying onto the battlefield. -- When Day of the Dragons leaves the battlefield, sacrifice all Dragons you control. Then return the exiled cards to the battlefield under your control.
 mana={4}{U}{U}{U}
@@ -26927,8 +26927,8 @@ type=Instant
 [/card]
 [card]
 name=Death by Dragons
-auto=choice name(you get a Dragon) token(Dragon,Creature Dragon,5/5,red,flying)
-auto=choice name(opponent gets a Dragon) token(Dragon,Creature Dragon,5/5,red,flying) opponent
+auto=choice name(you get a Dragon) _DRAGONTOKEN_
+auto=choice name(opponent gets a Dragon) _DRAGONTOKEN_ opponent
 text=Each player other than target player puts a 5/5 red Dragon creature token with flying onto the battlefield.
 mana={4}{R}{R}
 type=Sorcery
@@ -33691,7 +33691,7 @@ toughness=2
 name=Earthlink
 auto=upcost[{2}] sacrifice
 auto=lord(creature) transforms((,newability[@movedto(graveyard) from(this|mybattlefield):target(land|mybattlefield) sacrifice]))
-text=At the beginning of your upkeep, sacrifice Earthlink unless you pay {2}. -- Whenever a creature is put into a graveyard from the battlefield, that creature's controller sacrifices a land.
+text=At the beginning of your upkeep, sacrifice Earthlink unless you pay {2}. -- Whenever a creature dies, that creature's controller sacrifices a land.
 mana={3}{B}{R}{G}
 type=Enchantment
 [/card]
@@ -34044,7 +34044,7 @@ subtype=Arcane
 [/card]
 [card]
 name=Efficient Construction
-auto=@movedto(artifact|mystack):create(Thopter:Artifact Creature Thopter:1/1:flying)
+auto=@movedto(artifact|mystack):_THOPTERTOKEN_
 text=Whenever you cast an artifact spell, create a 1/1 colorless Thopter artifact creature token with flying.
 mana={3}{U}
 type=Enchantment
@@ -37876,7 +37876,7 @@ toughness=1
 [card]
 name=Experimental Aviator
 abilities=flying
-auto=create(Thopter:Artifact Creature Thopter:1/1:flying)*2
+auto=_THOPTERTOKEN_*2
 text=Flying -- When Experimental Aviator enters the battlefield, create two 1/1 colorless Thopter artifact creature tokens with flying.
 mana={3}{U}{U}
 type=Creature
@@ -39792,7 +39792,7 @@ type=Instant
 [/card]
 [card]
 name=Fendeep Summoner
-auto={T}:target(<upto:2>swamp) becomes(Treefolk Warrior,3/5) ueot
+auto={T}:target(<upto:2>swamp) transforms((Treefolk Warrior Creature,setpower=3,settoughness=5)) ueot
 text={T}: Up to two target Swamps each become 3/5 Treefolk Warrior creatures in addition to their other types until end of turn.
 mana={4}{B}
 type=Creature
@@ -40431,7 +40431,7 @@ toughness=4
 [/card]
 [card]
 name=Filigree Crawler
-auto=_DIES_create(Thopter:Artifact Creature Thopter:1/1:flying) controller
+auto=_DIES__THOPTERTOKEN_ controller
 text=When Filigree Crawler dies, create a 1/1 colorless Thopter artifact creature token with flying.
 mana={4}
 type=Artifact Creature
@@ -45266,7 +45266,7 @@ type=Artifact
 [/card]
 [card]
 name=Genesis Hydra
-aicode=activate target(<castx>*[-land;-instant;-sorcery;zpos<=castx]|mylibrary) moveto(mybattlefield)
+aicode=activate target(*[-land;-instant;-sorcery;zpos<=castx]|mylibrary) moveto(mybattlefield)
 autostack=if casted(this) then reveal:x optionone target(*[-land;-instant;-sorcery;manacost<=x]|reveal) moveto(mybattlefield) and!( all(*|reveal) moveto(mylibrary) and!(shuffle)! )! optiononeend optiontwo all(*|reveal) moveto(mylibrary) and!(shuffle)! optiontwoend revealend
 auto=counter(1/1,x)
 text=When you cast Genesis Hydra, reveal the top X cards of your library. You may put a nonland permanent card with mana value X or less from among them onto the battlefield. Then shuffle the rest into your library. -- Genesis Hydra enters the battlefield with X +1/+1 counters on it.
@@ -49872,7 +49872,7 @@ toughness=2
 name=Grazing Kelpie
 abilities=persist
 auto={GU}{S}:bottomoflibrary target(other *|graveyard)
-text={(g/u)}, Sacrifice Grazing Kelpie: Put target card in a graveyard on the bottom of its owner's library. -- Persist (When this creature is put into a graveyard from the battlefield, if it had no -1/-1 counters on it, return it to the battlefield under its owner's control with a -1/-1 counter on it.)
+text={(g/u)}, Sacrifice Grazing Kelpie: Put target card in a graveyard on the bottom of its owner's library. -- Persist (When this creature dies, if it had no -1/-1 counters on it, return it to the battlefield under its owner's control with a -1/-1 counter on it.)
 mana={3}{GU}
 type=Creature
 subtype=Beast
@@ -58319,7 +58319,7 @@ toughness=3
 [card]
 name=Inheritance
 auto=@movedTo(creature|graveyard) from(battlefield):pay({3}) draw:1
-text=Whenever a creature is put into a graveyard from the battlefield, you may pay {3}. If you do, draw a card.
+text=Whenever a creature dies, you may pay {3}. If you do, draw a card.
 mana={W}
 type=Enchantment
 [/card]
@@ -66944,7 +66944,7 @@ type=Instant
 [card]
 name=Lifeline
 auto=lord(creature) transforms((,newability[@movedTo(graveyard) from(this|battlefield) restriction{type(creature|battlefield)~morethan~0}:all(trigger[to]) [phaseaction[endofturn once] moveTo(mybattlefield)])) forever
-text=Whenever a creature is put into a graveyard from the battlefield, if another creature is on the battlefield, return the first card to the battlefield under its owner's control at the beginning of the next end step.
+text=Whenever a creature dies, if another creature is on the battlefield, return the first card to the battlefield under its owner's control at the beginning of the next end step.
 mana={5}
 type=Artifact
 [/card]
@@ -68256,7 +68256,7 @@ type=Land
 [card]
 name=Looter il-Kor
 abilities=shadow
-auto=@damagefoeof(player) from(this):_LOOT_ ueot
+auto=@damagefoeof(player) from(this):_LOOT_
 text=Shadow (This creature can block or be blocked by only creatures with shadow.) -- Whenever Looter il-Kor deals damage to an opponent, draw a card, then discard a card.
 mana={1}{U}
 type=Creature
@@ -72149,7 +72149,7 @@ toughness=1
 [card]
 name=Maverick Thopterist
 other={improvise} name(Improvise)
-auto=create(Thopter:Artifact Creature Thopter:1/1:flying)*2
+auto=_THOPTERTOKEN_*2
 text=Improvise (Your artifacts can help cast this spell. Each artifact you tap after you're done activating mana abilities pays for {1}.) -- When Maverick Thopterist enters the battlefield, create two 1/1 colorless Thopter artifact creature tokens with flying.
 mana={3}{U}{R}
 type=Creature
@@ -86642,7 +86642,7 @@ toughness=2
 [/card]
 [card]
 name=Pia Nalaar
-auto=create(Thopter:Artifact Creature Thopter:1/1:flying)
+auto=_THOPTERTOKEN_
 auto={1}{R}:target(creature[artifact]) 1/0
 auto={1}{S(artifact|mybattlefield)}:target(creature) cantblock
 text=When Pia Nalaar enters the battlefield, create a 1/1 colorless Thopter artifact creature token with flying. -- {1}{R}: Target artifact creature gets +1/+0 until end of turn. -- {1}, Sacrifice an artifact: Target creature can't block this turn.
@@ -89785,7 +89785,7 @@ type=Artifact
 name=Puppeteer Clique
 abilities=flying,persist
 auto=moveto(mybattlefield) and!(transforms((,haste,newability[@my next endofturn:moveTo(exile)])) forever)! target(creature|opponentgraveyard)
-text=Flying -- When Puppeteer Clique enters the battlefield, put target creature card in an opponent's graveyard onto the battlefield under your control. It has haste. At the beginning of your next end step, exile it. -- Persist (When this creature is put into a graveyard from the battlefield, if it had no -1/-1 counters on it, return it to the battlefield under its owner's control with a -1/-1 counter on it.)
+text=Flying -- When Puppeteer Clique enters the battlefield, put target creature card in an opponent's graveyard onto the battlefield under your control. It has haste. At the beginning of your next end step, exile it. -- Persist (When this creature dies, if it had no -1/-1 counters on it, return it to the battlefield under its owner's control with a -1/-1 counter on it.)
 mana={3}{B}{B}
 type=Creature
 subtype=Faerie Wizard
@@ -109683,7 +109683,7 @@ subtype=Aura
 [card]
 name=Soul Net
 auto=@movedTo(creature|graveyard) from(battlefield):pay({1}) life:1
-text=Whenever a creature is put into a graveyard from the battlefield, you may pay {1}. If you do, you gain 1 life.
+text=Whenever a creature dies, you may pay {1}. If you do, you gain 1 life.
 mana={1}
 type=Artifact
 [/card]
@@ -113690,7 +113690,7 @@ name=Stomp and Howl
 target=artifact
 auto=destroy
 auto=destroy target(enchantment)
-restriction=type(artifact|mybattlefield)~morethan~0,type(enchantment|mybattlefield)~morethan~0
+restriction=type(artifact|battlefield)~morethan~0,type(enchantment|battlefield)~morethan~0
 text=Destroy target artifact and target enchantment.
 mana={2}{G}
 type=Sorcery
@@ -124713,7 +124713,7 @@ toughness=3
 name=Tsabo Tavoc
 abilities=first strike
 auto=protection from(creature[legendary])
-auto={B}{B}:bury target(creature[legendary])
+auto={B}{B}{T}:bury target(creature[legendary])
 text=First strike, protection from legendary creatures -- {B}{B}, {T}: Destroy target legendary creature. It can't be regenerated.
 mana={5}{B}{R}
 type=Legendary Creature
@@ -126030,7 +126030,7 @@ type=Instant
 [/card]
 [card]
 name=Unfulfilled Desires
-auto={1}{L:1}:_LOOT_ ueot
+auto={1}{L:1}:_LOOT_
 text={1}, Pay 1 life: Draw a card, then discard a card.
 mana={1}{U}{B}
 type=Enchantment
@@ -128221,7 +128221,7 @@ subtype=Aura
 [card]
 name=Verdant Succession
 auto=lord(creature[green,-token]) transforms((,newability[@movedto(graveyard) from(this|mybattlefield):target(creature[share!name!]|mylibrary) moveTo(mybattlefield)]))
-text=Whenever a green nontoken creature is put into a graveyard from the battlefield, that creature's controller may search his or her library for a card with the same name as that creature and put it onto the battlefield. If that player does, he or she then shuffles his or her library.
+text=Whenever a green nontoken creature dies, that creature's controller may search his or her library for a card with the same name as that creature and put it onto the battlefield. If that player does, he or she then shuffles his or her library.
 mana={4}{G}
 type=Enchantment
 [/card]
@@ -130835,7 +130835,7 @@ toughness=1
 [card]
 name=Vulshok War Boar
 auto=aslongas(artifact|myBattlefield) moveTo(graveyard) notatarget(artifact|myBattlefield) oneshot
-auto=moveTo(graveyard) notatarget(this|myBattlefield)
+auto=name(sacrifice Vulshok War Boar) moveTo(graveyard) notatarget(this|myBattlefield)
 text=When Vulshok War Boar enters the battlefield, sacrifice it unless you sacrifice an artifact.
 mana={2}{R}{R}
 type=Creature
@@ -133511,7 +133511,7 @@ toughness=2
 [card]
 name=Whirler Virtuoso
 auto=alterenergy:3 controller
-auto={e:3}:create(Thopter:Artifact Creature Thopter:1/1:flying)
+auto={e:3}:_THOPTERTOKEN_
 text=When Whirler Virtuoso enters the battlefield, you get {E}{E}{E} (three energy counters). -- Pay {E}{E}{E}: Create a 1/1 colorless Thopter artifact creature token with flying.
 mana={1}{U}{R}
 type=Creature
@@ -133521,7 +133521,7 @@ toughness=3
 [/card]
 [card]
 name=Whirlermaker
-auto={4}{T}:create(Thopter:Artifact Creature Thopter:1/1:flying)
+auto={4}{T}:_THOPTERTOKEN_
 text={4}, {T}: Create a 1/1 colorless Thopter artifact creature token with flying.
 mana={3}
 type=Artifact
diff --git a/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt b/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
index 56eea269f..7bb11e5e5 100644
--- a/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
+++ b/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
@@ -592,7 +592,7 @@ name=Chandra, Pyromaster
 auto=counter(0/0,4,loyalty)
 auto={C(0/0,1,Loyalty)}:name(+1: Deals 1 damage to opponent and 1 to creature) damage:1 opponent && target(creature|opponentbattlefield) damage:1 && transforms((,newability[cantblock])) ueot
 auto={C(0/0,1,Loyalty)}:name(+1: Deals 1 damage to controller and 1 to creature) damage:1 controller && target(creature|mybattlefield) damage:1 && transforms((,newability[cantblock])) ueot
-auto={C(0/0,0,Loyalty)}:name(+0: Exile the top and may cast it) moveto(exile) and!(transforms((,newability[canplayfromexile])) ueot)! all(*[zpos=1]|mylibrary)
+auto={C(0/0,0,Loyalty)}:name(+0: Exile the top and may play it) moveto(exile) and!(transforms((,newability[canplayfromexile])) ueot)! all(*[zpos=1]|mylibrary)
 auto={C(0/0,-7,Loyalty)}:name(-7: Exile the top ten and may cast it) moveto(exile) all(*[zpos<=10]|mylibrary) && target(*[instant;sorcery]|myexile) clone && clone && clone 
 text=+1: Chandra, Pyromaster deals 1 damage to target player and 1 damage to up to one target creature that player controls. That creature can't block this turn. -- 0: Exile the top card of your library. You may play it this turn. -- -7: Exile the top ten cards of your library. Choose an instant or sorcery card exiled this way and copy it three times. You may cast the copies without paying their mana costs.
 mana={2}{R}{R}
@@ -2480,7 +2480,7 @@ name=Sarkhan, Fireblood
 auto=counter(0/0,3,loyalty)
 auto={C(0/0,1,Loyalty)}:name(+1: Discard and draw) ability$!may reject notatarget(*|myhand) and!(draw:1)! !$ controller
 auto={C(0/0,1,Loyalty)}:name(+1: Add two mana in any combination of colors) if type(dragon|mycastingzone)~morethan~0 then thisforeach(variable{2}) ability$!name(add mana) choice add{G} _ choice add{R} _ choice add{U} _ choice add{B} _ choice add{W}!$ controller
-auto={C(0/0,-7,Loyalty)}:name(-7: Create four 5/5 Dragons) token(Dragon,Creature Dragon,5/5,red,flying)*4
+auto={C(0/0,-7,Loyalty)}:name(-7: Create four 5/5 Dragons) _DRAGONTOKEN_*4
 text=+1: You may discard a card. If you do, draw a card. -- +1: Add two mana in any combination of colors. Spend this mana only to cast Dragon spells. -- −7: Create four 5/5 red Dragon creature tokens with flying.
 mana={1}{R}{R}
 type=Legendary Planeswalker
@@ -2502,7 +2502,7 @@ name=Sarkhan the Mad
 auto=counter(0/0,7,loyalty)
 aicode=activate moveto(myhand) and!( dynamicability<!mytgt manacoststrike tosrc!> )! notatarget(<1>*[zpos=1]|mylibrary)
 auto={C(0/0,0,Loyalty)}:name(+0: Reveal top, put in hand and deals damage) Reveal:1 revealzone(mylibrary) revealuntil(*|mylibrary) optionone name(put in hand) target(*|reveal) moveto(myhand) optiononeend afterrevealed all(this) damage:revealedmana afterrevealedend revealend
-auto={C(0/0,-2,Loyalty)}:name(-2: Target creature controller sacrifice and create a 5/5 Dragon) target(creature) sacrifice and!( token(Dragon,Creature Dragon,5/5,red,flying) targetcontroller )!
+auto={C(0/0,-2,Loyalty)}:name(-2: Target creature controller sacrifice and create a 5/5 Dragon) target(creature) sacrifice and!( _DRAGONTOKEN_ targetcontroller )!
 auto={C(0/0,-4,Loyalty)}:name(-4: All dragons deals damage to a player) all(creature[dragon]|mybattlefield) transforms((,newability[target(player) dynamicability<!powerstrike!>])) oneshot
 text=0: Reveal the top card of your library and put it into your hand. Sarkhan the Mad deals damage to himself equal to that card's mana value. -- -2: Target creature's controller sacrifices it, then that player puts a 5/5 red Dragon creature token with flying onto the battlefield. -- -4: Each Dragon creature you control deals damage equal to its power to target player.
 mana={3}{B}{R}