diff --git a/projects/mtg/bin/Res/sets/primitives/_macros.txt b/projects/mtg/bin/Res/sets/primitives/_macros.txt
index 8322bdf2f..dc93180e7 100644
--- a/projects/mtg/bin/Res/sets/primitives/_macros.txt
+++ b/projects/mtg/bin/Res/sets/primitives/_macros.txt
@@ -166,6 +166,12 @@ $AUTO_DEFINE _CLASH_ Put here a code if compare the casting cost based on Errati
 # Unearth
 #AUTO_DEFINE _UNEARTH_ name(Unearth) moveto(mybattlefield) and!( transforms((,newability[haste],newability[unearth],newability[exiledeath])) forever )! asSorcery
 
+# Exile the top card of your library. you may play it this turn.
+#AUTO_DEFINE __PLAY_TOP_FROM_EXILE__ moveto(exile) and!( transforms((,canplayfromexile)) ueot )! all(*[zpos=1]|mylibrary)
+
+# Ward
+#AUTO_DEFINE _WARD_($cost) @targeted(this) from(*|opponentzones):choice name(This spell costs $cost more) name(This spell costs $cost more) target(*|opponentzones) transforms((,newability[pay[[{$cost}]] name(pay $cost mana) donothing?fizzle])) oneshot
+
 # Angel Token
 #AUTO_DEFINE _ANGELTOKEN_ create(Angel:Creature Angel:4/4:white:flying)
 
@@ -184,6 +190,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)
 
+# Phyrexian Mite Token
+#AUTO_DEFINE _PHYREXIANMITETOKEN_ create(phyrexian mite:artifact creature phyrexian mite:1/1:poisontoxic:cantblock)
+
 # Red Elemental Token
 #AUTO_DEFINE _REDELEMENTALTOKEN_ create(Elemental:Creature Elemental:1/1:red)
 
diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index 160a93247..2b383ca8d 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -478,7 +478,7 @@ type=Conspiracy
 [card]
 name=Adriana, Captain of the Guard
 auto=_ATTACKING_1/1 ueot
-auto=_ATTACKING_all(other creature[attacking]) 1/1 ueot
+auto=all(other creature[attacking]|myBattlefield) 1/1 ueot
 text=Melee (Whenever this creature attacks, it gets +1/+1 until end of turn for each opponent you attacked with a creature this combat.) -- Other creatures you control have melee. (If a creature has multiple instances of melee, each triggers separately.)
 mana={3}{R}{W}
 type=Legendary Creature
@@ -488,7 +488,7 @@ toughness=4
 [/card]
 [card]
 name=Adrix and Nev, Twincasters
-auto=@targeted(this) from(*|opponentstack):choice name(This spell costs 2 more) name(This spell costs 2 more) target(*|opponentstack) transforms((,newability[pay[[{2}]] name(pay 2 mana) donothing?fizzle])) oneshot
+auto=_WARD_(2)
 auto=@tokencreated(*|myBattlefield):name(Double the token) all(trigger) clone options(notrigger)
 text=Ward {2} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {2}.) -- If one or more tokens would be created under your control, twice that many of those tokens are created instead.
 mana={2}{G}{U}
@@ -5688,6 +5688,7 @@ name=Batterbone
 auto={5}:equip
 auto=teach(creature) 1/1
 auto=teach(creature) vigilance
+auto=teach(creature) lifelink
 auto=livingweapontoken(Phyrexian Germ,Creature Phyrexian Germ,0/0,black)
 text=Living weapon (When this Equipment enters the battlefield, create a 0/0 black Phyrexian Germ creature token, then attach this to it.) -- Equipped creature gets +1/+1 and has vigilance and lifelink. -- Equip {5}
 mana={2}
@@ -8512,7 +8513,7 @@ type=Sorcery
 [card]
 name=Bond of Revival
 target=creature|mygraveyard
-auto=moveTo(mybattlefield) && transforms((,haste)) uynt
+auto=moveTo(mybattlefield) && transforms((,newability[haste])) uynt
 text=Return target creature card from your graveyard to the battlefield. It gains haste until your next turn.
 mana={4}{B}
 type=Sorcery
@@ -9823,7 +9824,7 @@ toughness=6
 name=Bronze Guardian
 abilities=double strike
 anyzone=type:artifact:myBattlefield/5 cdaactive
-auto=@targeted(this) from(*|opponentstack):choice name(This spell costs 2 more) name(This spell costs 2 more) target(*|opponentstack) transforms((,newability[pay[[{2}]] name(pay 2 mana) donothing?fizzle])) oneshot
+auto=_WARD_(2)
 text=Double strike -- Ward {2} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {2}.) -- Other artifacts you control have ward {2}. -- Bronze Guardian's power is equal to the number of artifacts you control.
 mana={4}{W}
 type=Artifact Creature
@@ -10130,7 +10131,7 @@ backside=Dire-Strain Demolisher
 restriction=compare(isflipped)~equalto~0
 anyzone={0}:doubleside(backside)
 auto=if type(*[day;night]|battlefield)~equalto~0 then name(It becomes day) activate castcard(noevent named!:Day:!)
-auto=@targeted(this) from(*|opponentstack):choice name(This spell costs 1 more) name(This spell costs 1 more) target(*|opponentstack) transforms((,newability[pay[[{1}]] name(pay 1 mana) donothing?fizzle])) oneshot
+auto=_WARD_(1)
 text=Ward {1} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {1}.) -- Daybound (If a player casts no spells during their own turn, it becomes night next turn.) // Dire-Strain Demolisher
 mana={3}{G}{G}
 type=Creature
@@ -10475,7 +10476,7 @@ toughness=5
 [card]
 name=Cadira, Caller of the Small
 abilities=trample
-auto=@combatdamaged(player) from(this):create(rabbit:creature rabbit:1/1:white)*type:*[token]|myBattlefield
+auto=@combatdamaged(player) from(this):create(rabbit:creature rabbit:1/1:white)*type:*[token]:myBattlefield
 text=Trample -- Whenever Cadira, Caller of the Small deals combat damage to a player, for each token you control, create a 1/1 white Rabbit creature token.
 mana={1}{G}{W}
 type=Legendary Creature
@@ -14172,26 +14173,26 @@ toughness=5
 [card]
 name=Colfenor, the Last Yew
 abilities=vigilance,reach
-auto=@movedTo(creature[power=1]|myGraveyard) from(mybattlefield):moveto(myhand) target(creature[power<1]|myGraveyard)
-auto=@movedTo(creature[power=3]|myGraveyard) from(mybattlefield):moveto(myhand) target(creature[power<2]|myGraveyard)
-auto=@movedTo(creature[power=4]|myGraveyard) from(mybattlefield):moveto(myhand) target(creature[power<3]|myGraveyard)
-auto=@movedTo(creature[power=5]|myGraveyard) from(mybattlefield):moveto(myhand) target(creature[power<4]|myGraveyard)
-auto=@movedTo(creature[power=6]|myGraveyard) from(mybattlefield):moveto(myhand) target(creature[power<5]|myGraveyard)
-auto=@movedTo(creature[power=7]|myGraveyard) from(mybattlefield):moveto(myhand) target(creature[power<6]|myGraveyard)
-auto=@movedTo(creature[power=8]|myGraveyard) from(mybattlefield):moveto(myhand) target(creature[power<7]|myGraveyard)
-auto=@movedTo(creature[power=9]|myGraveyard) from(mybattlefield):moveto(myhand) target(creature[power<8]|myGraveyard)
-auto=@movedTo(creature[power=10]|myGraveyard) from(mybattlefield):moveto(myhand) target(creature[power<9]|myGraveyard)
-auto=@movedTo(creature[power=11]|myGraveyard) from(mybattlefield):moveto(myhand) target(creature[power<10]|myGraveyard)
-auto=@movedTo(creature[power=12]|myGraveyard) from(mybattlefield):moveto(myhand) target(creature[power<11]|myGraveyard)
-auto=@movedTo(creature[power=13]|myGraveyard) from(mybattlefield):moveto(myhand) target(creature[power<12]|myGraveyard)
-auto=@movedTo(creature[power=14]|myGraveyard) from(mybattlefield):moveto(myhand) target(creature[power<13]|myGraveyard)
-auto=@movedTo(creature[power=15]|myGraveyard) from(mybattlefield):moveto(myhand) target(creature[power<14]|myGraveyard)
-auto=@movedTo(creature[power=16]|myGraveyard) from(mybattlefield):moveto(myhand) target(creature[power<15]|myGraveyard)
-auto=@movedTo(creature[power=17]|myGraveyard) from(mybattlefield):moveto(myhand) target(creature[power<16]|myGraveyard)
-auto=@movedTo(creature[power=18]|myGraveyard) from(mybattlefield):moveto(myhand) target(creature[power<17]|myGraveyard)
-auto=@movedTo(creature[power=19]|myGraveyard) from(mybattlefield):moveto(myhand) target(creature[power<18]|myGraveyard)
-auto=@movedTo(creature[power=20]|myGraveyard) from(mybattlefield):moveto(myhand) target(creature[power<19]|myGraveyard)
-auto=@movedTo(creature[power>20]|myGraveyard) from(mybattlefield):moveto(myhand) target(creature|myGraveyard)
+auto=@movedTo(creature[toughness=1]|Graveyard) from(mybattlefield):moveto(myhand) target(creature[toughness<=1]|myGraveyard)
+auto=@movedTo(creature[toughness=3]|Graveyard) from(mybattlefield):moveto(myhand) target(creature[toughness<=2]|myGraveyard)
+auto=@movedTo(creature[toughness=4]|Graveyard) from(mybattlefield):moveto(myhand) target(creature[toughness<=3]|myGraveyard)
+auto=@movedTo(creature[toughness=5]|Graveyard) from(mybattlefield):moveto(myhand) target(creature[toughness<=4]|myGraveyard)
+auto=@movedTo(creature[toughness=6]|Graveyard) from(mybattlefield):moveto(myhand) target(creature[toughness<=5]|myGraveyard)
+auto=@movedTo(creature[toughness=7]|Graveyard) from(mybattlefield):moveto(myhand) target(creature[toughness<=6]|myGraveyard)
+auto=@movedTo(creature[toughness=8]|Graveyard) from(mybattlefield):moveto(myhand) target(creature[toughness<=7]|myGraveyard)
+auto=@movedTo(creature[toughness=9]|Graveyard) from(mybattlefield):moveto(myhand) target(creature[toughness<=8]|myGraveyard)
+auto=@movedTo(creature[toughness=10]|Graveyard) from(mybattlefield):moveto(myhand) target(creature[toughness<=9]|myGraveyard)
+auto=@movedTo(creature[toughness=11]|Graveyard) from(mybattlefield):moveto(myhand) target(creature[toughness<=10]|myGraveyard)
+auto=@movedTo(creature[toughness=12]|Graveyard) from(mybattlefield):moveto(myhand) target(creature[toughness<=11]|myGraveyard)
+auto=@movedTo(creature[toughness=13]|Graveyard) from(mybattlefield):moveto(myhand) target(creature[toughness<=12]|myGraveyard)
+auto=@movedTo(creature[toughness=14]|Graveyard) from(mybattlefield):moveto(myhand) target(creature[toughness<=13]|myGraveyard)
+auto=@movedTo(creature[toughness=15]|Graveyard) from(mybattlefield):moveto(myhand) target(creature[toughness<=14]|myGraveyard)
+auto=@movedTo(creature[toughness=16]|Graveyard) from(mybattlefield):moveto(myhand) target(creature[toughness<=15]|myGraveyard)
+auto=@movedTo(creature[toughness=17]|Graveyard) from(mybattlefield):moveto(myhand) target(creature[toughness<=16]|myGraveyard)
+auto=@movedTo(creature[toughness=18]|Graveyard) from(mybattlefield):moveto(myhand) target(creature[toughness<=17]|myGraveyard)
+auto=@movedTo(creature[toughness=19]|Graveyard) from(mybattlefield):moveto(myhand) target(creature[toughness<=18]|myGraveyard)
+auto=@movedTo(creature[toughness=20]|Graveyard) from(mybattlefield):moveto(myhand) target(creature[toughness<=19]|myGraveyard)
+auto=@movedTo(creature[toughness>20]|Graveyard) from(mybattlefield):moveto(myhand) target(creature|myGraveyard)
 text=Vigilance, reach -- Whenever Colfenor, the Last Yew or another creature you control dies, return up to one other target creature card with lesser toughness from your graveyard to your hand.
 mana={3}{W}{B}{G}
 type=Legendary Creature
@@ -14262,8 +14263,7 @@ type=Sorcery
 [/card]
 [card]
 name=Collector Ouphe
-target=artifact
-auto=noactivatedability
+auto=lord(artifact) noactivatedability
 text=Activated abilities of artifacts can't be activated.
 mana={1}{G}
 type=Creature
@@ -14380,7 +14380,7 @@ toughness=3
 [card]
 name=Colossal Skyturtle
 abilities=flying
-auto=@targeted(this) from(*|opponentstack):choice name(This spell costs 2 more) name(This spell costs 2 more) target(*|opponentstack) transforms((,newability[pay[[{2}]] name(pay 2 mana) donothing?fizzle])) oneshot
+auto=_WARD_(2)
 autohand={2}{G}{discard}:target(*|mygraveyard) moveto(ownerhand)
 autohand={1}{U}{discard}:target(creature) moveto(ownerhand)
 text=Flying, ward {2} -- Channel - {2}{G}, Discard Colossal Skyturtle: Return target card from your graveyard to your hand. -- Channel - {1}{U}, Discard Colossal Skyturtle: Return target creature to its owner's hand.
@@ -17339,7 +17339,7 @@ subtype=Equipment
 [card]
 name=Dancing Sword Construct
 abilities=flying
-auto=@targeted(this) from(*|opponentstack):choice name(This spell costs 1 more) name(This spell costs 1 more) target(*|opponentstack) transforms((,newability[pay[[{1}]] name(pay 1 mana) donothing?fizzle])) oneshot
+auto=_WARD_(1)
 text=Flying -- Ward {1}
 mana={1}{W}
 type=Artifact Creature
@@ -18902,7 +18902,7 @@ type=Enchantment
 name=Demonic Vigor
 target=creature
 auto=teach(creature) +1/+1
-auto=teach(creature) When enchanted creature dies return that card to its owner's hand
+auto=teach(creature) auto=@movedTo(mytgt|Graveyard) from(Battlefield):all(trigger[to]) moveTo(ownerHand)
 text=Enchant creature -- Enchanted creature gets +1/+1. -- When enchanted creature dies, return that card to its owner's hand.
 mana={B}
 type=Enchantment
@@ -19985,7 +19985,7 @@ name=Dire-Strain Demolisher
 abilities=nightbound
 backside=Burly Breaker
 auto=if type(*[day;night]|battlefield)~equalto~0 then if type(*[nonight]|battlefield)~equalto~0 then name(It becomes night) name(It becomes night) name(It becomes night) activate castcard(noevent named!:Night:!)
-auto=@targeted(this) from(*|opponentstack):choice name(This spell costs 3 more) name(This spell costs 3 more) target(*|opponentstack) transforms((,newability[pay[[{3}]] name(pay 3 mana) donothing?fizzle])) oneshot
+auto=_WARD_(3)
 text=Ward {3} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {3}.) -- Nightbound (If a player casts at least two spells during their own turn, it becomes day next turn.) // Burly Breaker
 type=Creature
 subtype=Werewolf
@@ -20014,7 +20014,7 @@ type=Sorcery
 [/card]
 [card]
 name=Diregraf Horde
-auto=token(Zombie Dec)
+auto=token(Zombie Dec)*2
 auto=may name(Exile 2 cards) target(<upto:2>*|graveyard) moveto(exile)
 text=When Diregraf Horde enters the battlefield, create two 2/2 black Zombie creature tokens with decayed. When you do, exile up to two target cards from graveyards. (A creature with decayed can't block. When it attacks, sacrifice it at end of combat.)
 mana={4}{B}
@@ -29990,7 +29990,7 @@ name=Gavony Dawnguard
 aicode=activate transforms((,newability[if type(creature[zpos<=4;manacost<=3]|myLibrary)~morethan~0 then target(creature[zpos<=4;manacost<=3]|myLibrary) moveTo(myHand) and!( all(other *[zpos<=4]|mylibrary) moveto(myreveal) and!( bottomoflibrary )! )! else all(*[zpos<=4]|mylibrary) moveto(myreveal) and!( bottomoflibrary )! ])) oneshot
 auto=if type(*[day;night]|battlefield)~equalto~0 then name(It becomes day) activate castcard(noevent named!:Day:!)
 auto=@transformed(*[day;night]|battlefield):name(Look top 4 cards) reveal:4 optionone name(Get a creature) target(<upto:1>creature[manacost<=3]|reveal) moveto(myhand) optiononeend optiontwo name(put on bottom) target(<4>*|reveal) bottomoflibrary optiontwoend revealend
-auto=@targeted(this) from(*|opponentstack):choice name(This spell costs 1 more) name(This spell costs 1 more) target(*|opponentstack) transforms((,newability[pay[[{1}]] name(pay 1 mana) donothing?fizzle])) oneshot
+auto=_WARD_(1)
 text=Ward {1} -- If it's neither day nor night, it becomes day as Gavony Dawnguard enters the battlefield. -- Whenever day becomes night or night becomes day, look at the top four cards of your library. You may reveal a creature card with mana value 3 or less from among them and put it into your hand. Put the rest on the bottom of your library in any order.
 type=Creature
 subtype=Human Soldier
@@ -31874,6 +31874,7 @@ type=Sorcery
 [card]
 name=Go-Shintai of Life's Origin
 auto={W}{U}{B}{R}{G}{T}:target(enchantment|mygraveyard) moveTo(mybattlefield)
+auto=create(shrine:enchantment creature shrine:1/1)
 auto=@movedTo(Shrine[-token]|myBattlefield):create(shrine:enchantment creature shrine:1/1)
 text={W}{U}{B}{R}{G}, {T}: Return target enchantment card from your graveyard to the battlefield. -- Whenever Go-Shintai of Life's Origin or another nontoken Shrine enters the battlefield under your control, create a 1/1 colorless Shrine enchantment creature token.
 mana={3}{G}
@@ -33807,8 +33808,8 @@ toughness=2
 [card]
 name=Grow from the Ashes
 kicker={2}
-auto=Kicker {2} 
-auto=Search your library forbasic land card put it onto the battlefield then shuffle your library If this spell was kicked instead search your library for two basic land cards put them onto the battlefield then shuffle your library
+auto=if paid(kicker) then name(search two card) Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(<2>land[basic]|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(battlefield)])) optiononeend optiontwo name(shuffle) bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary and!(shuffle)! )! optiontwoend revealend
+auto=ifnot paid(kicker) then name(search card) Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(<1>land[basic]|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(battlefield)])) optiononeend optiontwo name(shuffle) bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary and!(shuffle)! )! optiontwoend revealend
 text=Kicker {2} (You may pay an additional {2} as you cast this spell.) -- Search your library for a basic land card, put it onto the battlefield, then shuffle your library. If this spell was kicked, instead search your library for two basic land cards, put them onto the battlefield, then shuffle your library.
 mana={2}{G}
 type=Sorcery
@@ -34592,7 +34593,7 @@ type=Land
 name=Hall of Storm Giants
 auto=if compare(type:land:myBattlefield)~morethan~2 then tap(noevent)
 auto={T}:Add{U}
-auto={5}{U}:name(Becomes giant) transforms((,newability[becomes(Creature Giant^7/7^blue) ueot],newability[@targeted(this) from(*|opponentstack):choice name(This spell costs 3 more) name(This spell costs 3 more) target(*|opponentstack) transforms((,newability[pay[[{3}]] name(pay 3 mana) donothing?fizzle])) oneshot])) ueot
+auto={5}{U}:name(Becomes giant) transforms((,newability[becomes(Creature Giant^7/7^blue) ueot],newability[_WARD_(3)])) ueot
 text=If you control two or more other lands, Hall of Storm Giants enters the battlefield tapped. -- {T}: Add {U}. -- {5}{U}: Until end of turn, Hall of Storm Giants becomes a 7/7 blue Giant creature with ward {3}. it's still a land. (Whenever it becomes the target of a spell or ability an opponent controls, counter it unless that player pays {3}.)
 type=Land
 [/card]
@@ -39450,7 +39451,7 @@ name=Inscription of Abundance
 kicker={2}{G}
 auto=if paid(kicker) then ability$!name(Target creature fights) may name(Target creature fights) target(creature|myBattlefield) transforms((,newability[target(creature|opponentBattlefield) dynamicability<!powerstrike eachother!>])) ueot!$ controller
 auto=if paid(kicker) then ability$!name(Gain life equal to power) may name(Gain life equal to power) target(player) life:power:highest:*:targetedpersonsbattlefield!$ controller
-auto=if paid(kicker) then ability$!name(Put two +1/+1 counters) may name(Put two +1/+1 counters) counter(1/1,2) target(creature)!$ controller
+auto=if paid(kicker) then ability$!name(Put two +1/+1 counters) may name(Put two +1/+1 counters)  target(creature) counter(1/1,2)!$ controller
 auto=ifnot paid(kicker) then choice name(Put two +1/+1 counters) name(Put two +1/+1 counters) counter(1/1,2) target(creature)
 auto=ifnot paid(kicker) then choice name(Gain life equal to power) name(Gain life equal to power) target(player) life:power:highest:*:targetedpersonsbattlefield
 auto=ifnot paid(kicker) then choice name(Target creature fights) name(Target creature fights) target(creature|myBattlefield) transforms((,newability[target(creature|opponentBattlefield) dynamicability<!powerstrike eachother!>])) ueot
@@ -45078,7 +45079,7 @@ toughness=4
 [card]
 name=Lier, Disciple of the Drowned
 auto=lord(*|stack) nofizzle
-auto=lord(*[instant;sorcery]|mygraveyard) transforms((,newability[canplayfromgraveyard],newability[gainedexiledeath]))
+auto=lord(*[instant;sorcery]|mygraveyard) transforms((,newability[canplayfromgraveyard],newability[gainedexiledeath])) forever
 text=Spells can't be countered. -- Each instant and sorcery card in your graveyard has flashback. The flashback cost is equal to that card's mana cost.
 type=Legendary Creature
 subtype=Human Wizard
@@ -49141,7 +49142,7 @@ toughness=4
 [card]
 name=Miirym, Sentinel Wyrm
 abilities=flying
-auto=@targeted(this) from(*|opponentstack):choice name(This spell costs 2 more) name(This spell costs 2 more) target(*|opponentstack) transforms((,newability[pay[[{2}]] name(pay 2 mana) donothing?fizzle])) oneshot
+auto=_WARD_(2)
 auto=@movedTo(other Dragon[-token]|myBattlefield):all(trigger[to]) clone options(nolegend) 
 text=Flying, ward {2} -- Whenever another nontoken Dragon enters the battlefield under your control, create a token that's a copy of it, except the token isn't legendary if that Dragon is legendary.
 mana={3}{G}{U}{R}
@@ -49623,7 +49624,7 @@ type=Enchantment
 [/card]
 [card]
 name=Mirrorshell Crab
-auto=@targeted(this) from(*|opponentstack):choice name(This spell costs 3 more) name(This spell costs 3 more) target(*|opponentstack) transforms((,newability[pay[[{3}]] name(pay 3 mana) donothing?fizzle])) oneshot
+auto=_WARD_(3)
 autohand={2}{U}{discard}:transforms((,newability[pay[[{3}]] name(pay 3 mana) donothing?fizzle])) forever target(*|stack)
 text=Ward {3} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {3}.) -- Channel - {2}{U}, Discard Mirrorshell Crab: Counter target spell or ability unless its controller pays {3}.
 mana={5}{U}{U}
@@ -53540,7 +53541,7 @@ toughness=2
 name=Obsessive Collector
 abilities=flying
 auto=@combatdamaged(player) from(this):name(Seek a card) transforms((,newability[name(Seek a card) moverandom(*[manacost=phandcount]) from(mylibrary) to(myhand)])) oneshot
-auto=@targeted(this) from(*|opponentstack):choice name(This spell costs 2 more) name(This spell costs 2 more) target(*|opponentstack) transforms((,newability[pay[[{2}]] name(pay 2 mana) donothing?fizzle])) oneshot
+auto=_WARD_(2)
 text=Flying -- Ward {2} -- Whenever Obessive Collector deals combat damage to a player, seek a card with mana value equal to the number of cards in your hand.
 mana={3}{U}
 type=Creature
@@ -54855,18 +54856,6 @@ power=6
 toughness=6
 [/card]
 [card]
-name=Ormos, Archive Keeper
-abilities=flying
-auto={1}{U}{U}{D(*|myhand)}{D(*|myhand)}{D(*|myhand)}:draw:5 controller
-auto=aslongas(*|mylibrary) replacedraw counter(1/1,5) <1
-text=Flying -- If you would draw a card while your library has no cards in it, instead put five +1/+1 counters on Ormos, Archive Keeper. -- {1}{U}{U}, Discard three cards with different names: Draw five cards.
-mana={4}{U}{U}
-type=Legendary Creature
-subtype=Sphinx
-power=5
-toughness=5
-[/card]
-[card]
 name=Ornate Kanzashi
 auto={2}{T}:all(*[zpos=1]|opponentlibrary) moveto(exile) and!(activate castcard(copied) ueot)! 
 text={2}, {T}: Target opponent exiles the top card of his or her library. You may play that card this turn.
@@ -55066,7 +55055,7 @@ toughness=2
 name=Otherworldly Gaze
 flashback={1}{U}
 aicode=activate transforms((,newability[target(<anyamount>*[zpos<=3]|mylibrary) moveto(mygraveyard)])) oneshot
-auto=name(Reveal top 3 cards) reveal:3 optionone name(Get a card) target(<upto:3>*|reveal) moveto(mygraveyard) optiononeend optiontwo name(put back) target(<3>*|reveal) moveto(mylibrary) optiontwoend revealend
+auto=name(Reveal top 3 cards) reveal:3 optionone name(Put into your graveyard) target(<upto:3>*|reveal) moveto(mygraveyard) optiononeend optiontwo name(top of your library) target(<3>*|reveal) moveto(mylibrary) optiontwoend revealend
 text=Look at the top three cards of your library. Put any number of them into your graveyard and the rest back on top of your library in any order. -- Flashback {1}{U} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
 mana={U}
 type=Instant
@@ -57823,7 +57812,7 @@ type=Artifact
 [card]
 name=Portal to Phyrexia
 auto=ability$!name(sacrifice) notatarget(<3>creature|mybattlefield) sacrifice!$ opponent
-auto=@each my upkeep:target(creature|graveyard) moveto(mybattlefield)
+auto=@each my upkeep:target(creature|graveyard) moveto(mybattlefield) and!(becomes(Phyrexian) forever)!
 text=When Portal to Phyrexia enters the battlefield, each opponent sacrifices three creatures. -- At the beginning of your upkeep, put target creature card from a graveyard onto the battlefield under your control. It's a Phyrexian in addition to its other types.
 mana={9}
 type=Artifact
@@ -58367,19 +58356,6 @@ text=As Primal Beyond enters the battlefield, you may reveal an Elemental card f
 type=Land
 [/card]
 [card]
-name=Primal Command
-auto=choice name(Gain life and return non-creature) transforms((,newability[choice name(You gain life) life:7 controller && name(Return non-creature) target(*[-creature]|battlefield) moveTo(ownerlibrary)],newability[choice name(Opponent gains life) life:7 opponent && name(Return non-creature) target(*[-creature]|battlefield) moveTo(ownerlibrary)])) oneshot
-auto=choice name(Gain life and return graveyard) transforms((,newability[choice name(You gain life) life:7 controller && target(player) moveTo(ownerlibrary) and!(shuffle)! all(*|targetedpersonsgraveyard)],newability[choice name(Opponent gains life) life:7 opponent && target(player) moveTo(ownerlibrary) and!(shuffle)! all(*|targetedpersonsgraveyard)])) oneshot
-auto=choice name(Gain life and search creature) transforms((,newability[choice name(You gain life) life:7 controller && name(Search creature) target(creature|mylibrary) moveTo(myhand) and!( shuffle )!],newability[choice name(Opponent gains life) life:7 opponent && name(Search creature) target(creature|mylibrary) moveTo(myhand) and!( shuffle )!])) oneshot
-auto=choice name(Return non-creature and return graveyard) ability$!name(Player shuffles graveyard) name(Player shuffles graveyard) target(player) moveTo(ownerlibrary) and!(shuffle)! all(*|targetedpersonsgraveyard)!$ controller && ability$!name(Put non-creature on top) name(Put non-creature on top) target(*[-creature]|battlefield) transforms((,newability[moveTo(ownerlibrary)])) oneshot!$ controller
-auto=if type(creature|mylibrary)~equalto~0 then choice choice name(Return non-creature and search creature) name(Return non-creature and search creature) target(*[-creature]|battlefield) moveTo(ownerlibrary)
-auto=if type(creature|mylibrary)~morethan~0 then choice name(Search creature and return non-creature) name(Search creature and return non-creature) target(creature|mylibrary) moveTo(myhand) and!( transforms((,newability[name(Put non-creature on top) target(*[-creature]|battlefield) moveTo(ownerlibrary)])) oneshot )!
-auto=choice name(Return graveyard and search creature) ability$!name(Search creature) name(Search creature) target(creature|mylibrary) moveTo(myhand) and!( shuffle )! !$ controller && ability$!name(Player shuffles graveyard) name(Player shuffles graveyard) target(player) moveTo(ownerlibrary) and!(shuffle)! all(*|targetedpersonsgraveyard)!$ controller
-text=Choose two -- Target player gains 7 life; or put target noncreature permanent on top of its owner's library; or target player shuffles his or her graveyard into his or her library; or search your library for a creature card, reveal it, put it into your hand, then shuffle your library.
-mana={3}{G}{G}
-type=Sorcery
-[/card]
-[card]
 name=Primal Empathy
 auto=@each my upkeep restriction{type(creature[power=power:highest:creature:myBattlefield]|myBattlefield)~equalto~type(creature[power=power:highest:creature:opponentBattlefield]|opponentBattlefield)}:draw:1 controller
 auto=@each my upkeep restriction{type(creature[power=power:highest:creature:myBattlefield]|myBattlefield)~morethan~type(creature[power=power:highest:creature:opponentBattlefield]|opponentBattlefield)}:draw:1 controller
@@ -59271,7 +59247,7 @@ name=Purple Worm
 other={3}{G}{G} name(Cast for 2 less)
 otherrestriction=morbid
 restriction=type(creature[fresh]|mygraveyard)~equalto~0
-auto=@targeted(this) from(*|opponentstack):choice name(This spell costs 2 more) name(This spell costs 2 more) target(*|opponentstack) transforms((,newability[pay[[{2}]] name(pay 2 mana) donothing?fizzle])) oneshot
+auto=_WARD_(2)
 text=This spell costs {2} less to cast if a creature died this turn. -- Ward {2} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {2}.)
 mana={5}{G}{G}
 type=Creature
@@ -60820,9 +60796,9 @@ toughness=1
 [card]
 name=Ratadrabik of Urborg
 abilities=vigilance
-auto=@targeted(this) from(*|opponentstack):choice name(This spell costs 2 more) name(This spell costs 2 more) target(*|opponentstack) transforms((,newability[pay[[{2}]] name(pay 2 mana) donothing?fizzle])) oneshot
+auto=_WARD_(2)
 auto=lord(other zombie|myBattlefield) vigilance
-auto=@movedTo(other creature[legendary]|graveyard) from(battlefield):all(trigger[from]) clone options(nolegend) and!( transforms((Zombie,setpower=2,settoughness=2,newcolors[black])) forever )!
+auto=@movedTo(other creature[legendary]|graveyard) from(mybattlefield):all(trigger[from]) clone options(nolegend) and!( transforms((Zombie,setpower=2,settoughness=2,newcolors[black])) forever )!
 text=Vigilance, ward {2} -- Other Zombies you control have vigilance. -- Whenever another legendary creature you control dies, create a token that's a copy of that creature, except it's not legendary and it's a 2/2 black Zombie in addition to its other colors and types.
 mana={2}{W}{B}
 type=Legendary Creature
@@ -63127,7 +63103,7 @@ toughness=3
 [/card]
 [card]
 name=Rimeshield Frost Giant
-auto=@targeted(this) from(*|opponentstack):choice name(This spell costs 3 more) name(This spell costs 3 more) target(*|opponentstack) transforms((,newability[pay[[{3}]] name(pay 3 mana) donothing?fizzle])) oneshot
+auto=_WARD_(3)
 text=Ward {3} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {3}.)
 mana={3}{U}{U}
 type=Creature
@@ -63137,7 +63113,7 @@ toughness=5
 [/card]
 [card]
 name=Rimewall Protector
-auto=@targeted(this) from(*|opponentstack):choice name(This spell costs 1 more) name(This spell costs 1 more) target(*|opponentstack) transforms((,newability[pay[[{1}]] name(pay 1 mana) donothing?fizzle])) oneshot
+auto=_WARD_(1)
 auto=all(other *[giant;wizard]|mybattlefield) counter(0/0.1.PerpetualWard) notrg
 auto=all(*[giant;wizard]|myhand) counter(0/0.1.PerpetualWard) notrg
 auto=emblem transforms((,newability[@targeted(*[counter{(0/0.1.PerpetualWard}]|mybattlefield)) from(*|opponentstack):choice name(This spell costs 1 more) name(This spell costs 1 more) target(*|opponentstack) transforms((,newability[pay[[{1}]] name(pay 1 mana) donothing?fizzle])) oneshot])) forever dontremove
@@ -66797,7 +66773,7 @@ type=Sorcery
 [card]
 name=Scourge of Nel Toth
 abilities=flying
-flashback=restriction{type(creature|myBattlefield)~morethan~2} {B}{B}{S(creature|mybattlefield)}{S(creature|mybattlefield)} 
+flashback=restriction{type(creature|myBattlefield)~morethan~1} {B}{B}{S(creature|mybattlefield)}{S(creature|mybattlefield)} 
 text=Flying -- You may cast Scourge of Nel Toth from your graveyard by paying {B}{B} and sacrificing two creatures rather than paying its mana cost.
 mana={5}{B}{B}
 type=Creature
@@ -66875,6 +66851,7 @@ toughness=2
 name=Scrapyard Recombiner
 abilities=modular
 modular=2
+auto=_DIES_may thisforeach(counter{1/1.1}) counter(1/1) target(creature[artifact])
 auto={T}{S(artifact|myBattlefield)}:moveto(myhand) target(creature[construct]|mylibrary)
 text=Modular 2 (This creature enters the battlefield with two +1/+1 counters on it. When it dies, you may put its +1/+1 counters on target artifact creature.) -- {T}, Sacrifice an artifact: Search your library for a Construct card, reveal it, put it into your hand, then shuffle your library.
 mana={3}
@@ -69195,8 +69172,8 @@ toughness=2
 [card]
 name=Shivan Wumpus
 abilities=trample
-auto=ability$!name(Choose one) choice name(Sacrifice land) notatarget(land|mybattlefield) sacrifice && move(onwerlibrary) all(Shivan Wumpus[fresh]|opponentbattlefield) _ choice name(Don't sacrifice land) donothing!$ opponent
-auto=ability$!name(Choose one) choice name(Sacrifice land) notatarget(land|mybattlefield) sacrifice && move(mylibrary) all(Shivan Wumpus[fresh]|mybattlefield) _ choice name(Don't sacrifice land) donothing!$ controller
+auto=ability$!name(Choose one) choice name(Sacrifice land) notatarget(land|mybattlefield) sacrifice && moveto(ownerlibrary) all(Shivan Wumpus[fresh]|opponentbattlefield) _ choice name(Don't sacrifice land) donothing!$ opponent
+auto=ability$!name(Choose one) choice name(Sacrifice land) notatarget(land|mybattlefield) sacrifice && moveto(ownerlibrary) all(Shivan Wumpus[fresh]|mybattlefield) _ choice name(Don't sacrifice land) donothing!$ controller
 text=Trample -- When Shivan Wumpus enters the battlefield, any player may sacrifice a land. If a player does, put Shivan Wumpus on top of its owner's library.
 mana={3}{R}
 type=Creature
@@ -69537,7 +69514,7 @@ toughness=1
 [card]
 name=Siege Veteran
 auto=@each my combatbegins:counter(1/1) target(creature|myBattlefield)
-auto=@movedTo(other Soldier[-token]|graveyard) from(battlefield):create(soldier:artifact creature soldier:1/1)
+auto=@movedTo(other Soldier[-token]|graveyard) from(mybattlefield):create(soldier:artifact creature soldier:1/1)
 text=At the beginning of combat on your turn, put a +1/+1 counter on target creature you control. -- Whenever another nontoken Soldier you control dies, create a 1/1 colorless Soldier artifact creature token.
 mana={2}{W}
 type=Creature
@@ -72851,7 +72828,7 @@ toughness=3
 [card]
 name=Sparring Regimen
 auto=_LEARN_
-auto=@each my blockers:name(Put 1/1 counter) target(creature[attacking]|myBattlefield) transforms((,newability[counter(1/1),newability[untap])) oneshot
+auto=@each my blockers:name(Put 1/1 counter) target(creature[attacking]|myBattlefield) transforms((,newability[counter(1/1)],newability[untap])) oneshot
 text=When Sparring Regimen enters the battlefield, learn. (You may reveal a Lesson card you own from outside the game and put it into your hand, or discard a card to draw a card.) -- Whenever you attack, put a +1/+1 counter on target attacking creature and untap it.
 mana={2}{W}
 type=Enchantment
@@ -76582,7 +76559,7 @@ subtype=Desert
 [/card]
 [card]
 name=Suspend
-auto=name(Exile creature) name(Exile creature) target(creature) moveto(myexile) and!( transforms((,newability[counter(0/0.2.Time)],newability[@each my upkeep restriction{compare(hascnttime)~equalto~1}:name(Cast creature from exile) moveto(myReveal) and!( moveto(myBattlefield) and!( transforms((,newability[moveTo(myBattlefield) and!( if cantargetcard(creature|*) then transforms((,newability[haste])) forever )!])) forever )! )!],newability[@each my upkeep restriction{compare(hascnttime)~morethan~1}:counter(0/0.-1.Time)])) forever )!
+auto=name(Exile creature) name(Exile creature) target(creature) moveto(exile) and!( transforms((,newability[counter(0/0.2.Time)],newability[@each my upkeep restriction{compare(hascnttime)~equalto~1}:name(Cast creature from exile) moveto(Reveal) and!( moveto(ownerBattlefield) and!( transforms((,newability[moveTo(ownerBattlefield) and!( if cantargetcard(creature|*) then transforms((,newability[haste])) forever )!])) forever )! )!],newability[@each my upkeep restriction{compare(hascnttime)~morethan~1}:counter(0/0.-1.Time)])) forever )!
 text=Exile target creature and put two time counters on it. If it doesn't have suspend, it gains suspend. (At the beginning of its owner's upkeep, they remove a time counter. When the last is removed, they play it without paying its mana cost. If it's a creature, it has haste.)
 mana={U}
 type=Instant
@@ -76615,7 +76592,6 @@ toughness=1
 [/card]
 [card]
 name=Svella, Ice Shaper
-aicode=activate castcard(normal) target(*[-land;zpos<=4]|mylibrary)
 auto={6}{R}{G}{T}:name(Look top 4 cards) reveal:4 optionone name(Cast Spell) target(<1>*[-land]|reveal) moveto(ownerlibrary) and!( becomes(tobecast) ueot )! optiononeend optiontwo name(bottom of library) target(<1>*|reveal) transforms((,newability[all(*|reveal) bottomoflibrary])) oneshot optiontwoend afterrevealed all(tobecast|mylibrary) moveto(ownerlibrary) and!( activate castcard(normal) )! afterrevealedend revealend
 auto={3}{T}:token(Icy Manalith)
 text={3}, {T}: Create a colorless snow artifact token named Icy Manalith with "{T}: Add one mana of any color." -- {6}{R}{G}, {T}: Look at the top four cards of your library. You may cast a spell from among them without paying its mana cost. Put the rest on the bottom of your library in a random order.
@@ -78603,7 +78579,7 @@ toughness=1
 [card]
 name=Terror of Mount Velus
 abilities=flying,double strike
-auto=all(creatures|myBattlefield) double strike
+auto=all(creature|myBattlefield) double strike
 text=Flying, double strike -- When Terror of Mount Velus enters the battlefield, creatures you control gain double strike until end of turn.
 mana={5}{R}{R}
 type=Creature
@@ -80972,7 +80948,7 @@ toughness=3
 [card]
 name=Tolarian Terror
 anyzone=foreach(*[instant;sorcery]|mygraveyard) changecost(colorless:-1) forcedalive
-auto=@targeted(this) from(*|opponentstack):choice name(This spell costs 2 more) name(This spell costs 2 more) target(*|opponentstack) transforms((,newability[pay[[{2}]] name(pay 2 mana) donothing?fizzle])) oneshot
+auto=_WARD_(2)
 text=This spell costs {1} less to cast for each instant and sorcery card in your graveyard. -- Ward {2} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {2}.)
 mana={6}{U}
 type=Creature
@@ -81002,7 +80978,7 @@ toughness=3
 [/card]
 [card]
 name=Tomakul Honor Guard
-auto=@targeted(this) from(*|opponentstack):choice name(This spell costs 2 more) name(This spell costs 2 more) target(*|opponentstack) transforms((,newability[pay[[{2}]] name(pay 2 mana) donothing?fizzle])) oneshot
+auto=_WARD_(2)
 text=Ward {2} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {2}.)
 mana={1}{G}
 type=Creature
@@ -81353,7 +81329,7 @@ otherrestriction=can play sorcery,compare(isflipped)~equalto~1
 restriction=compare(isflipped)~equalto~0
 anyzone={0}:doubleside(Flamethrower Sonata)
 autostack=if paid(alternative) then transforms((,newability[moveto(mygraveyard)],newability[activate castcard(copied named!:flamethrower sonata:!)])) forever
-auto=@targeted(this) from(*|opponentstack):choice name(This spell costs 2 more) name(This spell costs 2 more) target(*|opponentstack) transforms((,newability[pay[[{2}]] name(pay 2 mana) donothing?fizzle])) oneshot
+auto=_WARD_(2)
 auto=if type(*[instant;sorcery:manacost=0]|mygraveyard)~morethan~0 then choice name(Exile instant or sorcery with manacost 0) name(Exile instant or sorcery with manacost 0) target(*[instant;sorcery;manacost=0]|mygraveyard) moveto(myexile)
 auto=if type(*[instant;sorcery:manacost=1]|mygraveyard)~morethan~0 then choice name(Exile instant or sorcery with manacost 1) name(Exile instant or sorcery with manacost 1) target(*[instant;sorcery;manacost=1]|mygraveyard) moveto(myexile) and!( all(this) counter(1/1) )!
 auto=if type(*[instant;sorcery:manacost=2]|mygraveyard)~morethan~0 then choice name(Exile instant or sorcery with manacost 2) name(Exile instant or sorcery with manacost 2) target(*[instant;sorcery;manacost=2]|mygraveyard) moveto(myexile) and!( all(this) counter(1/1) )!
@@ -83110,7 +83086,7 @@ toughness=3
 [card]
 name=Unblinking Observer
 auto=this(variable{type:*[hasdisturb]:mygraveyard}>0) {T}:add{U}
-auto=this(variable{type:*[instant;sorcery]:myhand}>0) {T}:add{R}
+auto=this(variable{type:*[instant;sorcery]:myhand}>0) {T}:add{U}
 text={T}: Add {U}. Spend this mana only to pay a disturb cost or cast an instant or sorcery spell.
 type=Creature
 subtype=Homunculus
@@ -84561,7 +84537,7 @@ toughness=4
 [card]
 name=Varis, Silverymoon Ranger
 abilities=reach
-auto=@targeted(this) from(*|opponentstack):choice name(This spell costs 1 more) name(This spell costs 1 more) target(*|opponentstack) transforms((,newability[pay[[{1}]] name(pay 1 mana) donothing?fizzle])) oneshot
+auto=_WARD_(1)
 auto=@movedTo(*[creature;planeswalker]|mystack) restriction{compare(type:*[nodngplr]:mybattlefieldplustype:*[nodngopp]:opponentbattlefieldplusend)~equalto~0} turnlimited:name(Venture into dungeon) transforms((,newability[if type(*[dungeon]|mycommandzone)~morethan~0 then name(Explore the dungeon) name(Explore the dungeon) all(*[dungeon]|mycommandzone) counter(0/0.1.Explore)],newability[if type(*[dungeon]|mycommandzone)~equalto~0 then name(Choose a new dungeon) name(Choose a new dungeon) target(*[dungeon]|mysideboard) moveTo(mycommandzone) and!( counter(0/0.1.Explore) )!])) oneshot
 auto=@dungeoncompleted(*[dungeon]|mysideboard) from(controller):name(Create wolf) _WOLFTOKEN_
 text=Reach, ward {1} -- Whenever you cast a creature or planeswalker spell, venture into the dungeon. This ability triggers only once each turn. (Enter the first room or advance to the next room.) -- Whenever you complete a dungeon, create a 2/2 green Wolf creature token.
@@ -86015,7 +85991,7 @@ toughness=1
 [/card]
 [card]
 name=Vizier of the True
-auto=@exerted(this):tap target(cretaure|opponentbattlefield)
+auto=@exerted(creature|myBattlefield):target(creature|opponentbattlefield) tap
 auto=_ATTACKING_may exert
 text=You may exert Vizier of the True as it attacks. (It won't untap during your next untap step.) -- Whenever you exert a creature, tap target creature an opponent controls.
 mana={3}{W}
@@ -87289,7 +87265,7 @@ toughness=2
 [card]
 name=Waterfall Aerialist
 abilities=flying
-auto=@targeted(this) from(*|opponentstack):choice name(This spell costs 2 more) name(This spell costs 2 more) target(*|opponentstack) transforms((,newability[pay[[{2}]] name(pay 2 mana) donothing?fizzle])) oneshot
+auto=_WARD_(2)
 text=Flying -- Ward {2} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {2}.)
 mana={3}{U}
 type=Creature
@@ -88167,7 +88143,7 @@ toughness=3
 [card]
 name=Wilson, Refined Grizzly
 abilities=reach,trample,vigilance,nofizzle,chooseabackground
-auto=@targeted(this) from(*|opponentstack):choice name(This spell costs 2 more) name(This spell costs 2 more) target(*|opponentstack) transforms((,newability[pay[[{2}]] name(pay 2 mana) donothing?fizzle])) oneshot
+auto=_WARD_(2)
 text=This spell can't be countered. -- Vigilance, reach, trample -- Ward {2} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {2}.) -- Choose a Background (You can have a Background as a second commander.)
 mana={1}{G}
 type=Legendary Creature
@@ -89826,6 +89802,7 @@ toughness=4
 name=Zabaz, the Glimmerwasp
 abilities=modular
 modular=1
+auto=_DIES_may thisforeach(counter{1/1.1}) counter(1/1) target(creature[artifact])
 auto={R}:name(Destroy artifact) target(artifact|myBattlefield)
 auto={W}:name(Gains flying) transforms((,newability[flying])) ueot
 auto=@counteradded(1/1) from(*[modular]|myBattlefield) except(Zabaz, the Glimmerwasp):may name(Trigger modular) counter(1/1) target(creature[counter{1/1.1}]|myBattlefield)
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index aa09661c5..715631e82 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -7281,16 +7281,6 @@ power=2
 toughness=3
 [/card]
 [card]
-name=Austere Command
-auto=choice name(Destroy all Artifacts) destroy all(artifact) && all(this) transforms((,newability[choice name(Destroy all Enchantments) destroy all(enchantment)],newability[choice name(Destroy all Creatures w/ manacost 3 or less) destroy all(creature[manacost<=3])],newability[choice name(Destroy all Creatures w/ manacost 4 or greater) destroy all(creature[manacost>=4])]))
-auto=choice name(Destroy all Enchantments) destroy all(enchantment) && all(this) transforms((,newability[choice name(Destroy all Artifacts) destroy all(artifact)],newability[choice name(Destroy all Creatures w/ manacost 3 or less) destroy all(creature[manacost<=3])],newability[choice name(Destroy all Creatures w/ manacost 4 or greater) destroy all(creature[manacost>=4])]))
-auto=choice name(Destroy all Creatures w/ manacost 3 or less) destroy all(creature[manacost<=3]) && all(this) transforms((,newability[choice name(Destroy all Artifacts) destroy all(artifact)],newability[choice name(Destroy all Enchantments) destroy all(enchantment)],newability[choice name(Destroy all Creatures w/ manacost 4 or greater) destroy all(creature[manacost>=4])]))
-auto=choice name(Destroy all Creatures w/ manacost 4 or greater) destroy all(creature[manacost>=4]) && all(this) transforms((,newability[choice name(Destroy all Artifacts) destroy all(artifact)],newability[choice name(Destroy all Enchantments) destroy all(enchantment)],newability[choice name(Destroy all Creatures w/ manacost 3 or less) destroy all(creature[manacost<=3])]))
-text=Choose two - Destroy all artifacts; or destroy all enchantments; or destroy all creatures with mana value 3 or less; or destroy all creatures with mana value 4 or greater.
-mana={4}{W}{W}
-type=Sorcery
-[/card]
-[card]
 name=Authority of the Consuls
 auto=lord(*[recent;creature]|opponentbattlefield) transforms((,newability[tap(noevent)]))
 auto=@movedTo(creature|opponentBattlefield):life:1 controller
@@ -7838,7 +7828,7 @@ toughness=2
 [card]
 name=Aven Windreader
 abilities=flying
-auto={1}{u}:target(player) reveal:1 optionone name(Put On Top) target(*|reveal) moveto(ownerlibrary) optiononeend optiontwo name(put back) all(*|reveal) moveto(library) optiontwoend revealend
+auto={1}{u}:target(player) reveal:1 optionone name(Put On Top) target(*|reveal) moveto(ownerlibrary) optiononeend optiontwo name(put back) all(*|reveal) moveto(ownerlibrary) optiontwoend revealend
 text=Flying (This creature can't be blocked except by creatures with flying or reach.) -- {1}{U}: Target player reveals the top card of his or her library.
 mana={3}{U}{U}
 type=Creature
@@ -7888,7 +7878,7 @@ type=Instant
 [/card]
 [card]
 name=Avenging Druid
-auto=@damagefoeof(player) from(this):may name(Get Land) Reveal:1 revealzone(mylibrary) revealuntil(*[land]|mylibrary) optionone choice name(Get Card) target(land|reveal) moveto(myhand) optiononeend optiontwo choice name(put in graveyard) all(*|reveal) moveto(mygraveyard) optiontwoend revealend
+auto=@damagefoeof(player) from(this):may name(Get Land) Reveal:1 revealzone(mylibrary) revealuntil(*[land]|mylibrary) optionone choice name(Get Card) target(land|reveal) moveto(battlefield) optiononeend optiontwo choice name(put in graveyard) all(*|reveal) moveto(mygraveyard) optiontwoend revealend
 text=Whenever Avenging Druid deals damage to an opponent, you may reveal cards from the top of your library until you reveal a land card. If you do, put that card onto the battlefield and put all other cards revealed this way into your graveyard.
 mana={2}{G}
 type=Creature
@@ -16347,27 +16337,27 @@ subtype=Aura
 [card]
 name=Cairn Wanderer
 abilities=changeling
-auto=aslongas(creature[flying]|graveyard) flying
-auto=aslongas(creature[fear]|graveyard) fear
-auto=aslongas(creature[first strike]|graveyard) first strike
-auto=aslongas(creature[double strike]|graveyard) double strike
-auto=aslongas(creature[deathtouch]|graveyard) deathtouch
-auto=aslongas(creature[haste]|graveyard) haste
-auto=aslongas(creature[plainswalk]|graveyard) plainswalk
-auto=aslongas(creature[islandwalk]|graveyard) islandwalk
-auto=aslongas(creature[swampwalk]|graveyard) swampwalk
-auto=aslongas(creature[mountainwalk]|graveyard) mountainwalk
-auto=aslongas(creature[forestwalk]|graveyard) forestwalk
-auto=aslongas(creature[lifelink]|graveyard) lifelink
-auto=aslongas(creature[protection from white]|graveyard) protection from white
-auto=aslongas(creature[protection from blue]|graveyard) protection from blue
-auto=aslongas(creature[protection from black]|graveyard) protection from black
-auto=aslongas(creature[protection from red]|graveyard) protection from red
-auto=aslongas(creature[protection from green]|graveyard) protection from green
-auto=aslongas(creature[reach]|graveyard) reach
-auto=aslongas(creature[trample]|graveyard) trample
-auto=aslongas(creature[shroud]|graveyard) shroud
-auto=aslongas(creature[vigilance]|graveyard) vigilance
+auto=aslongas(creature[flying]|graveyard) flying >0
+auto=aslongas(creature[fear]|graveyard) fear>0
+auto=aslongas(creature[first strike]|graveyard) first strike >0
+auto=aslongas(creature[double strike]|graveyard) double strike >0
+auto=aslongas(creature[deathtouch]|graveyard) deathtouch >0
+auto=aslongas(creature[haste]|graveyard) haste >0
+auto=aslongas(creature[plainswalk]|graveyard) plainswalk >0
+auto=aslongas(creature[islandwalk]|graveyard) islandwalk >0
+auto=aslongas(creature[swampwalk]|graveyard) swampwalk >0
+auto=aslongas(creature[mountainwalk]|graveyard) mountainwalk >0
+auto=aslongas(creature[forestwalk]|graveyard) forestwalk >0
+auto=aslongas(creature[lifelink]|graveyard) lifelink >0
+auto=aslongas(creature[protection from white]|graveyard) protection from white >0
+auto=aslongas(creature[protection from blue]|graveyard) protection from blue >0
+auto=aslongas(creature[protection from black]|graveyard) protection from black >0
+auto=aslongas(creature[protection from red]|graveyard) protection from red >0
+auto=aslongas(creature[protection from green]|graveyard) protection from green >0
+auto=aslongas(creature[reach]|graveyard) reach >0
+auto=aslongas(creature[trample]|graveyard) trample >0
+auto=aslongas(creature[shroud]|graveyard) shroud >0
+auto=aslongas(creature[vigilance]|graveyard) vigilance >0
 text=Changeling (This card is every creature type at all times.) -- As long as a creature card with flying is in a graveyard, Cairn Wanderer has flying. The same is true for fear, first strike, double strike, deathtouch, haste, landwalk, lifelink, protection, reach, trample, shroud, and vigilance.
 mana={4}{B}
 type=Creature
@@ -16578,7 +16568,7 @@ toughness=1
 [card]
 name=Caller of the Claw
 abilities=flash
-auto=foreach(creature[-token;fresh]|graveyard) token(Bear,Creature Bear,2/2,green)
+auto=foreach(creature[-token;fresh]|mygraveyard) token(Bear,Creature Bear,2/2,green)
 text=Flash -- When Caller of the Claw enters the battlefield, put a 2/2 green Bear creature token onto the battlefield for each nontoken creature put into your graveyard from the battlefield this turn.
 mana={2}{G}
 type=Creature
@@ -38356,7 +38346,7 @@ toughness=4
 [/card]
 [card]
 name=Faceless Butcher
-auto=(blink)forsrc target(creature|battlefield)
+auto=(blink)forsrc target(other creature|battlefield)
 text=When Faceless Butcher enters the battlefield, exile target creature other than Faceless Butcher. -- When Faceless Butcher leaves the battlefield, return the exiled card to the battlefield under its owner's control.
 mana={2}{B}{B}
 type=Creature
@@ -61034,7 +61024,7 @@ toughness=6
 [/card]
 [card]
 name=Junkyo Bell
-auto=@each my upkeep:may target(creature|mybattlefield) transforms((,treason,newability[foreach(creature|mybattlefield) 1/1])) ueot
+auto=@each my upkeep:may target(creature|mybattlefield) transforms((,treason,newability[type:creature:myBattlefield/type:creature:myBattlefield])) ueot
 text=At the beginning of your upkeep, you may have target creature you control get +X/+X until end of turn, where X is the number of creatures you control. If you do, sacrifice that creature at the beginning of the next end step.
 mana={4}
 type=Artifact
@@ -82089,7 +82079,7 @@ toughness=6
 [card]
 name=Old Man of the Sea
 abilities=shackler
-auto={T}:shackle target(creature[power<=storedpower])
+auto={T}:shackle target(creature[power<=power])
 auto=@each my untap restriction{canuntap}:may untap
 text=You may choose not to untap Old Man of the Sea during your untap step. -- {T}: Gain control of target creature with power less than or equal to Old Man of the Sea's power for as long as Old Man of the Sea remains tapped and that creature's power remains less than or equal to Old Man of the Sea's power.
 mana={1}{U}{U}
@@ -106613,11 +106603,11 @@ toughness=1
 [/card]
 [card]
 name=Skinwing
-auto={4}:equip
+auto={6}:equip
 auto=teach(creature) 2/2
 auto=teach(creature) flying
 auto=livingweapontoken(Phyrexian Germ,Creature Phyrexian Germ,0/0,black)
-text=Living weapon (When this Equipment enters the battlefield, create a 0/0 black Phyrexian Germ creature token, then attach this to it.) -- Equipped creature gets +2/+2 and has flying. -- Equip {4}
+text=Living weapon (When this Equipment enters the battlefield, create a 0/0 black Phyrexian Germ creature token, then attach this to it.) -- Equipped creature gets +2/+2 and has flying. -- Equip {6}
 mana={4}
 type=Artifact
 subtype=Equipment
@@ -112728,8 +112718,8 @@ toughness=1
 [/card]
 [card]
 name=Stampede
-auto=all(creature|attacking) 1/0
-auto=all(creature|attacking) trample
+auto=all(creature[attacking]) 1/0
+auto=all(creature[attacking]) trample
 text=Attacking creatures get +1/+0 and gain trample until end of turn.
 mana={1}{G}{G}
 type=Instant
@@ -119475,7 +119465,7 @@ toughness=3
 name=Teysa, Envoy of Ghosts
 abilities=Vigilance
 auto=protection from(creature)
-auto=@combatdamage(player) from(creature):all(trigger[from]) destroy && token(Spirit,Creature Spirit,1/1,white,black,flying)
+auto=@combatdamaged(player) from(creature):all(trigger[from]) destroy && token(Spirit,Creature Spirit,1/1,white,black,flying)
 text=Vigilance, protection from creatures -- Whenever a creature deals combat damage to you, destroy that creature. Create a 1/1 white and black Spirit creature token with flying.
 mana={5}{W}{B}
 type=Legendary Creature
diff --git a/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt b/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
index 63be93e79..18ea0fb6f 100644
--- a/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
+++ b/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
@@ -1084,7 +1084,7 @@ subtype=Gideon
 [card]
 name=Gideon Jura
 auto=counter(0/0,6,loyalty)
-auto={C(0/0,2,Loyalty)}:name(+2: Creatures attack Guideon Jura) all(creature|opponentbattlefield) mustattack (Gideon Jura) ueot
+auto={C(0/0,2,Loyalty)}:name(+2: Creatures attack Guideon Jura) all(creature|opponentbattlefield) _GOAD_
 auto={C(0/0,-2,Loyalty)}:name(-2: Destroy target tapped creature) destroy target(creature[tapped])
 auto={C(0/0,0,Loyalty)}:name(+0: Transforms Gideon to 6/6) transforms((Creature Human Soldier,setpower=6,settoughness=6,newability[preventAllDamage to(this)])) ueot
 text=+2: During target opponent's next turn, creatures that player controls attack Gideon Jura if able. -- -2: Destroy target tapped creature. -- 0: Until end of turn, Gideon Jura becomes a 6/6 Human Soldier creature that's still a planeswalker. Prevent all damage that would be dealt to him this turn.