diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index 8c2f6499f..32f3a3b61 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -35500,7 +35500,7 @@ type=Sorcery
 [card]
 name=Glint Raker
 abilities=flying
-aicode=activate transforms((,newability[if type(artifact[zpos<=thatmuch]|mylibrary)~equalto~0 then all(*[zpos<=thatmuch]|mylibrary) moveto(mygraveyard)],newability[if type(artifact[zpos<=thatmuch]|mylibrary)~morethan~0 then target(artifact[zpos<=thatmuch]|mylibrary) moveto(myhand) and!( all(*[zpos<=thatmuch]|mylibrary) moveto(mygraveyard) )!]
+aicode=activate transforms((,newability[if type(artifact[zpos<=thatmuch]|mylibrary)~equalto~0 then all(*[zpos<=thatmuch]|mylibrary) moveto(mygraveyard)],newability[if type(artifact[zpos<=thatmuch]|mylibrary)~morethan~0 then target(artifact[zpos<=thatmuch]|mylibrary) moveto(myhand) and!( all(*[zpos<=thatmuch]|mylibrary) moveto(mygraveyard) )!]))
 auto=this(variable{convertedcost:highest:artifact:mybattlefield}>0)while 1/0
 auto=this(variable{convertedcost:highest:artifact:mybattlefield}>1)while 1/0
 auto=this(variable{convertedcost:highest:artifact:mybattlefield}>2)while 1/0
@@ -56982,7 +56982,7 @@ auto=if compare(fullpaid)~equalto~5 then if type(planeswalker|battlefield)~moret
 auto=if compare(fullpaid)~equalto~5 then if type(planeswalker|battlefield)~morethan~0 then if type(creature|battlefield)~equalto~0 then choice name(Damage planeswalker and creature gains) name(Damage planeswalker and creature gains) name(Damage planeswalker and creature gains) name(Damage planeswalker and creature gains) target(planeswalker|battlefield) damage:fullpaid
 auto=if compare(fullpaid)~equalto~6 then if type(creature|battlefield)~morethan~0 then choice name(Opponent discards and damage creature) name(Opponent discards and damage creature) name(Opponent discards and damage creature) target(creature|battlefield) damage:fullpaid && ability$!name(Discard cards) notatarget(<6>*|myhand) reject!$ opponent
 auto=if compare(fullpaid)~equalto~6 then if type(creature|battlefield)~equalto~0 then choice name(Opponent discards and damage creature) name(Opponent discards and damage creature) name(Opponent discards and damage creature) ability$!name(Discard cards) notatarget(<6>*|myhand) reject!$ opponent
-auto=if compare(fullpaid)~equalto~6 then if type(creature|battlefield)~morethan~0 then choice name(You discard and damage creature) name(You discard and damage creature) name(You discard and damage creature) target(creature|battlefield) damage:fullpaid && ability$!name(Discard cards) notatarget(<6>*|myhand) reject!$ controller )!
+auto=if compare(fullpaid)~equalto~6 then if type(creature|battlefield)~morethan~0 then choice name(You discard and damage creature) name(You discard and damage creature) name(You discard and damage creature) target(creature|battlefield) damage:fullpaid && ability$!name(Discard cards) notatarget(<6>*|myhand) reject!$ controller
 auto=if compare(fullpaid)~equalto~6 then if type(creature|battlefield)~equalto~0 then choice name(You discard and damage creature) name(You discard and damage creature) name(You discard and damage creature) ability$!name(Discard cards) notatarget(<6>*|myhand) reject!$ controller
 auto=if compare(fullpaid)~equalto~6 then if type(planeswalker|battlefield)~morethan~0 then choice name(Opponent discards and damage planeswalker) name(Opponent discards and damage planeswalker) name(Opponent discards and damage planeswalker) target(planeswalker|battlefield) damage:fullpaid && ability$!name(Discard cards) notatarget(<6>*|myhand) reject!$ opponent
 auto=if compare(fullpaid)~equalto~6 then if type(planeswalker|battlefield)~morethan~0 then choice name(Opponent discards and damage planeswalker) name(Opponent discards and damage planeswalker) name(Opponent discards and damage planeswalker) target(planeswalker|battlefield) damage:fullpaid && ability$!name(Discard cards) notatarget(<6>*|myhand) reject!$ opponent
@@ -57002,7 +57002,7 @@ auto=if compare(fullpaid)~equalto~6 then if type(planeswalker|battlefield)~moret
 auto=if compare(fullpaid)~equalto~6 then if type(planeswalker|battlefield)~morethan~0 then if type(creature|battlefield)~equalto~0 then choice name(Damage planeswalker and creature gains) name(Damage planeswalker and creature gains) name(Damage planeswalker and creature gains) name(Damage planeswalker and creature gains) target(planeswalker|battlefield) damage:fullpaid
 auto=if compare(fullpaid)~equalto~7 then if type(creature|battlefield)~morethan~0 then choice name(Opponent discards and damage creature) name(Opponent discards and damage creature) name(Opponent discards and damage creature) target(creature|battlefield) damage:fullpaid && ability$!name(Discard cards) notatarget(<7>*|myhand) reject!$ opponent
 auto=if compare(fullpaid)~equalto~7 then if type(creature|battlefield)~equalto~0 then choice name(Opponent discards and damage creature) name(Opponent discards and damage creature) name(Opponent discards and damage creature) ability$!name(Discard cards) notatarget(<7>*|myhand) reject!$ opponent
-auto=if compare(fullpaid)~equalto~7 then if type(creature|battlefield)~morethan~0 then choice name(You discard and damage creature) name(You discard and damage creature) name(You discard and damage creature) target(creature|battlefield) damage:fullpaid && ability$!name(Discard cards) notatarget(<7>*|myhand) reject!$ controller )!
+auto=if compare(fullpaid)~equalto~7 then if type(creature|battlefield)~morethan~0 then choice name(You discard and damage creature) name(You discard and damage creature) name(You discard and damage creature) target(creature|battlefield) damage:fullpaid && ability$!name(Discard cards) notatarget(<7>*|myhand) reject!$ controller
 auto=if compare(fullpaid)~equalto~7 then if type(creature|battlefield)~equalto~0 then choice name(You discard and damage creature) name(You discard and damage creature) name(You discard and damage creature) ability$!name(Discard cards) notatarget(<7>*|myhand) reject!$ controller
 auto=if compare(fullpaid)~equalto~7 then if type(planeswalker|battlefield)~morethan~0 then choice name(Opponent discards and damage planeswalker) name(Opponent discards and damage planeswalker) name(Opponent discards and damage planeswalker) target(planeswalker|battlefield) damage:fullpaid && ability$!name(Discard cards) notatarget(<7>*|myhand) reject!$ opponent
 auto=if compare(fullpaid)~equalto~7 then if type(planeswalker|battlefield)~morethan~0 then choice name(Opponent discards and damage planeswalker) name(Opponent discards and damage planeswalker) name(Opponent discards and damage planeswalker) target(planeswalker|battlefield) damage:fullpaid && ability$!name(Discard cards) notatarget(<7>*|myhand) reject!$ opponent
@@ -57022,7 +57022,7 @@ auto=if compare(fullpaid)~equalto~7 then if type(planeswalker|battlefield)~moret
 auto=if compare(fullpaid)~equalto~7 then if type(planeswalker|battlefield)~morethan~0 then if type(creature|battlefield)~equalto~0 then choice name(Damage planeswalker and creature gains) name(Damage planeswalker and creature gains) name(Damage planeswalker and creature gains) name(Damage planeswalker and creature gains) target(planeswalker|battlefield) damage:fullpaid
 auto=if compare(fullpaid)~equalto~8 then if type(creature|battlefield)~morethan~0 then choice name(Opponent discards and damage creature) name(Opponent discards and damage creature) name(Opponent discards and damage creature) target(creature|battlefield) damage:fullpaid && ability$!name(Discard cards) notatarget(<8>*|myhand) reject!$ opponent
 auto=if compare(fullpaid)~equalto~8 then if type(creature|battlefield)~equalto~0 then choice name(Opponent discards and damage creature) name(Opponent discards and damage creature) name(Opponent discards and damage creature) ability$!name(Discard cards) notatarget(<8>*|myhand) reject!$ opponent
-auto=if compare(fullpaid)~equalto~8 then if type(creature|battlefield)~morethan~0 then choice name(You discard and damage creature) name(You discard and damage creature) name(You discard and damage creature) target(creature|battlefield) damage:fullpaid && ability$!name(Discard cards) notatarget(<8>*|myhand) reject!$ controller )!
+auto=if compare(fullpaid)~equalto~8 then if type(creature|battlefield)~morethan~0 then choice name(You discard and damage creature) name(You discard and damage creature) name(You discard and damage creature) target(creature|battlefield) damage:fullpaid && ability$!name(Discard cards) notatarget(<8>*|myhand) reject!$ controller
 auto=if compare(fullpaid)~equalto~8 then if type(creature|battlefield)~equalto~0 then choice name(You discard and damage creature) name(You discard and damage creature) name(You discard and damage creature) ability$!name(Discard cards) notatarget(<8>*|myhand) reject!$ controller
 auto=if compare(fullpaid)~equalto~8 then if type(planeswalker|battlefield)~morethan~0 then choice name(Opponent discards and damage planeswalker) name(Opponent discards and damage planeswalker) name(Opponent discards and damage planeswalker) target(planeswalker|battlefield) damage:fullpaid && ability$!name(Discard cards) notatarget(<8>*|myhand) reject!$ opponent
 auto=if compare(fullpaid)~equalto~8 then if type(planeswalker|battlefield)~morethan~0 then choice name(Opponent discards and damage planeswalker) name(Opponent discards and damage planeswalker) name(Opponent discards and damage planeswalker) target(planeswalker|battlefield) damage:fullpaid && ability$!name(Discard cards) notatarget(<8>*|myhand) reject!$ opponent
@@ -57042,7 +57042,7 @@ auto=if compare(fullpaid)~equalto~8 then if type(planeswalker|battlefield)~moret
 auto=if compare(fullpaid)~equalto~8 then if type(planeswalker|battlefield)~morethan~0 then if type(creature|battlefield)~equalto~0 then choice name(Damage planeswalker and creature gains) name(Damage planeswalker and creature gains) name(Damage planeswalker and creature gains) name(Damage planeswalker and creature gains) target(planeswalker|battlefield) damage:fullpaid
 auto=if compare(fullpaid)~equalto~9 then if type(creature|battlefield)~morethan~0 then choice name(Opponent discards and damage creature) name(Opponent discards and damage creature) name(Opponent discards and damage creature) target(creature|battlefield) damage:fullpaid && ability$!name(Discard cards) notatarget(<9>*|myhand) reject!$ opponent
 auto=if compare(fullpaid)~equalto~9 then if type(creature|battlefield)~equalto~0 then choice name(Opponent discards and damage creature) name(Opponent discards and damage creature) name(Opponent discards and damage creature) ability$!name(Discard cards) notatarget(<9>*|myhand) reject!$ opponent
-auto=if compare(fullpaid)~equalto~9 then if type(creature|battlefield)~morethan~0 then choice name(You discard and damage creature) name(You discard and damage creature) name(You discard and damage creature) target(creature|battlefield) damage:fullpaid && ability$!name(Discard cards) notatarget(<9>*|myhand) reject!$ controller )!
+auto=if compare(fullpaid)~equalto~9 then if type(creature|battlefield)~morethan~0 then choice name(You discard and damage creature) name(You discard and damage creature) name(You discard and damage creature) target(creature|battlefield) damage:fullpaid && ability$!name(Discard cards) notatarget(<9>*|myhand) reject!$ controller
 auto=if compare(fullpaid)~equalto~9 then if type(creature|battlefield)~equalto~0 then choice name(You discard and damage creature) name(You discard and damage creature) name(You discard and damage creature) ability$!name(Discard cards) notatarget(<9>*|myhand) reject!$ controller
 auto=if compare(fullpaid)~equalto~9 then if type(planeswalker|battlefield)~morethan~0 then choice name(Opponent discards and damage planeswalker) name(Opponent discards and damage planeswalker) name(Opponent discards and damage planeswalker) target(planeswalker|battlefield) damage:fullpaid && ability$!name(Discard cards) notatarget(<9>*|myhand) reject!$ opponent
 auto=if compare(fullpaid)~equalto~9 then if type(planeswalker|battlefield)~morethan~0 then choice name(Opponent discards and damage planeswalker) name(Opponent discards and damage planeswalker) name(Opponent discards and damage planeswalker) target(planeswalker|battlefield) damage:fullpaid && ability$!name(Discard cards) notatarget(<9>*|myhand) reject!$ opponent
@@ -57062,7 +57062,7 @@ auto=if compare(fullpaid)~equalto~9 then if type(planeswalker|battlefield)~moret
 auto=if compare(fullpaid)~equalto~9 then if type(planeswalker|battlefield)~morethan~0 then if type(creature|battlefield)~equalto~0 then choice name(Damage planeswalker and creature gains) name(Damage planeswalker and creature gains) name(Damage planeswalker and creature gains) name(Damage planeswalker and creature gains) target(planeswalker|battlefield) damage:fullpaid
 auto=if compare(fullpaid)~morethan~9 then if type(creature|battlefield)~morethan~0 then choice name(Opponent discards and damage creature) name(Opponent discards and damage creature) name(Opponent discards and damage creature) target(creature|battlefield) damage:fullpaid && ability$!name(Discard cards) notatarget(<10>*|myhand) reject!$ opponent
 auto=if compare(fullpaid)~morethan~9 then if type(creature|battlefield)~equalto~0 then choice name(Opponent discards and damage creature) name(Opponent discards and damage creature) name(Opponent discards and damage creature) ability$!name(Discard cards) notatarget(<10>*|myhand) reject!$ opponent
-auto=if compare(fullpaid)~morethan~9 then if type(creature|battlefield)~morethan~0 then choice name(You discard and damage creature) name(You discard and damage creature) name(You discard and damage creature) target(creature|battlefield) damage:fullpaid && ability$!name(Discard cards) notatarget(<10>*|myhand) reject!$ controller )!
+auto=if compare(fullpaid)~morethan~9 then if type(creature|battlefield)~morethan~0 then choice name(You discard and damage creature) name(You discard and damage creature) name(You discard and damage creature) target(creature|battlefield) damage:fullpaid && ability$!name(Discard cards) notatarget(<10>*|myhand) reject!$ controller
 auto=if compare(fullpaid)~morethan~9 then if type(creature|battlefield)~equalto~0 then choice name(You discard and damage creature) name(You discard and damage creature) name(You discard and damage creature) ability$!name(Discard cards) notatarget(<10>*|myhand) reject!$ controller
 auto=if compare(fullpaid)~morethan~9 then if type(planeswalker|battlefield)~morethan~0 then choice name(Opponent discards and damage planeswalker) name(Opponent discards and damage planeswalker) name(Opponent discards and damage planeswalker) target(planeswalker|battlefield) damage:fullpaid && ability$!name(Discard cards) notatarget(<10>*|myhand) reject!$ opponent
 auto=if compare(fullpaid)~morethan~9 then if type(planeswalker|battlefield)~morethan~0 then choice name(Opponent discards and damage planeswalker) name(Opponent discards and damage planeswalker) name(Opponent discards and damage planeswalker) target(planeswalker|battlefield) damage:fullpaid && ability$!name(Discard cards) notatarget(<10>*|myhand) reject!$ opponent
@@ -64719,7 +64719,7 @@ type=Sorcery
 [card]
 name=Pegasus Courser
 abilities=flying
-auto=_ATTACKING_target(other creature[attaking]) flying ueot
+auto=_ATTACKING_target(other creature[attacking]) flying ueot
 text=Flying -- Whenever Pegasus Courser attacks, another target attacking creature gains flying until end of turn.
 mana={2}{W}
 type=Creature
@@ -77393,8 +77393,7 @@ type=Land
 name=Season of Growth
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
 auto=@movedto(creature|mybattlefield):_SCRY1_
-auto=@targeted(creature|myBattlefield) from(instant,sorcery|mystack):draw:1 controller
-auto=@targeted(creature|mybattlefield) from(*[instant;sorcery]|nonbattlezone,stack):draw:1 controller
+auto=@targeted(creature|myBattlefield) from(*|mystack):draw:1 controller
 text=Whenever a creature enters the battlefield under your control, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.) -- Whenever you cast a spell that targets a creature you control, draw a card.
 mana={1}{G}
 type=Enchantment
@@ -82171,7 +82170,7 @@ toughness=3
 [/card]
 [card]
 name=Smelting Vat
-aicode=activate transforms((,newability[if type(artifact[zpos<=8]|mylibrary)~equalto~0 then all(*[zpos<=8]|mylibrary) moveto(myreveal) and!( bottomoflibrary )!],newability[if type(artifact[zpos<=8]|mylibrary)~morethan~0 then target(artifact[zpos<=8]|mylibrary) moveto(mybattlefield) and!( all(*[zpos<=thatmuch]|mylibrary) moveto(myreveal) and!( bottomoflibrary )! )!]
+aicode=activate transforms((,newability[if type(artifact[zpos<=8]|mylibrary)~equalto~0 then all(*[zpos<=8]|mylibrary) moveto(myreveal) and!( bottomoflibrary )!],newability[if type(artifact[zpos<=8]|mylibrary)~morethan~0 then target(artifact[zpos<=8]|mylibrary) moveto(mybattlefield) and!( all(*[zpos<=thatmuch]|mylibrary) moveto(myreveal) and!( bottomoflibrary )! )!]))
 auto={1}{T}{S(other artifact[manacost=0]|mybattlefield)}:name(Sacrifice artifact with manacost 0) reveal:8 optionone name(Get an artifact) target(<upto:2>artifact[-creature&manacost<=0]|reveal) moveto(mybattlefield) optiononeend optiontwo name(Put on bottom) target(*|reveal) bottomoflibrary and!( all(*|reveal) bottomoflibrary )! optiontwoend revealend
 auto={1}{T}{S(other artifact[manacost=1]|mybattlefield)}:name(Sacrifice artifact with manacost 1) reveal:8 optionone name(Get an artifact) target(<upto:2>artifact[-creature&manacost<=1]|reveal) moveto(mybattlefield) optiononeend optiontwo name(Put on bottom) target(*|reveal) bottomoflibrary and!( all(*|reveal) bottomoflibrary )! optiontwoend revealend
 auto={1}{T}{S(other artifact[manacost=2]|mybattlefield)}:name(Sacrifice artifact with manacost 2) reveal:8 optionone name(Get an artifact) target(<upto:2>artifact[-creature&manacost<=2]|reveal) moveto(mybattlefield) optiononeend optiontwo name(Put on bottom) target(*|reveal) bottomoflibrary and!( all(*|reveal) bottomoflibrary )! optiontwoend revealend
@@ -89904,7 +89903,7 @@ toughness=4
 [card]
 name=Terisiare's Devastation
 auto=life:-fullpaid controller
-auto=token(Powerstone)*fullpaid and!( tap(noevent) )! && ability!name(Creature gain -1/-1) foreach(artifact|mybattlefield) all(creature|battlefield) -1/-1 ueot!$ controller
+auto=token(Powerstone)*fullpaid and!( tap(noevent) )! && ability$!name(Creature gain -1/-1) foreach(artifact|mybattlefield) all(creature|battlefield) -1/-1 ueot!$ controller
 text=You lose X life and create X tapped Powerstone tokens. Then all creatures get -1/-1 until end of turn for each artifact you control. (The tokens are artifacts with "{T}: Add {C}. This mana can't be spent to cast a nonartifact spell.")
 mana={X}{2}{B}{B}
 type=Sorcery