diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index 9bd82fb05..ac53007fb 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -31784,7 +31784,7 @@ toughness=5
 name=Gargos, Vicious Watcher
 abilities=vigilance
 auto=lord(hydra|mycastingzone) altercost(colorless,-4)
-auto=@targeted(creature|mybattlefield):transforms((,newability[target(creature|opponentbattlefield) dynamicability<!powerstrike eachother!>]))
+auto=@targeted(creature|mybattlefield) from(*|stack):may transforms((,newability[target(creature|opponentbattlefield) dynamicability<!powerstrike eachother!>]))
 text=Vigilance -- Hydra spells you cast cost {4} less to cast. -- Whenever a creature you control becomes the target of a spell, Gargos, Vicious Watcher fights up to one target creature you don't control.
 mana={3}{G}{G}{G}
 type=Legendary Creature
@@ -35576,7 +35576,7 @@ toughness=1
 [/card]
 [card]
 name=Grazilaxx, Illithid Scholar
-auto=@combat(blocked,turnlimited) source(creature|myBattlefield):may name(Return to hand) all(trigger[to]) moveto(ownerhand)
+auto=@combat(blocked) source(creature|myBattlefield):may name(Return to hand) all(trigger[to]) moveto(ownerhand)
 auto=@each combatdamage restriction{opponentdamagedbycombat}:name(Draw card) draw:1 controller
 text=Whenever a creature you control becomes blocked, you may return it to its owner's hand. -- Whenever one or more creatures you control deal combat damage to a player, draw a card.
 mana={1}{U}{U}
@@ -36115,7 +36115,7 @@ type=Sorcery
 [/card]
 [card]
 name=Growing Rites of Itlimoc
-auto=reveal:4 optionone name(Get a creature card) may target(creature|reveal) moveto(myhand) optiononeend optiontwo name(put on bottom) target(<4>*|reveal) bottomoflibrary optiontwoend revealend
+auto=reveal:4 optionone name(Get a creature card) target(<1>creature|reveal) moveto(myhand) optiononeend optiontwo name(put on bottom) target(<4>*|reveal) bottomoflibrary optiontwoend revealend
 auto=@each my endofturn restriction{type(creature|mybattlefield)~morethan~3}:flip(Itlimoc, Cradle of the Sun)
 text=When Growing Rites of Itlimoc enters the battlefield, look at the top four cards of your library. You may reveal a creature card from among them and put it into your hand. Put the rest on the bottom of your library in any order. -- At the beginning of your end step, if you control four or more creatures, transform Growing Rites of Itlimoc.
 mana={2}{G}
@@ -37803,8 +37803,8 @@ toughness=5
 [card]
 name=Haywire Mite
 auto=_DIES_life:2
-auto={G}{S}:moveto(exile) target(artifact[-creature])
-auto={G}{S}:moveto(exile) target(enchantment[-creature])
+auto={G}{S}:name(Exile noncreature artifact) moveto(exile) target(artifact[-creature])
+auto={G}{S}:name(Exile noncreature enchantment) moveto(exile) target(enchantment[-creature])
 text=When Haywire Mite dies, you gain 2 life. -- {G}, Sacrifice Haywire Mite: Exile target noncreature artifact or noncreature enchantment.
 mana={1}
 type=Artifact Creature
@@ -55686,8 +55686,8 @@ type=Instant
 [card]
 name=Neyith of the Dire Hunt
 auto=@combat(blocked) source(creature|mybattlefield) turnlimited:name(Draw a card) draw:1 controller
-auto=@damaged(creature) from(creature[-attacking]|mybattlefield) turnlimited:may name(Draw a card) draw:1 controller
-auto=@each my combatbegins:name(Pay and double creature's power) pay({2}{RG}) name(Pay and double creature's power) target(creature) transforms((,newability[p/0],newability[all(creature|opponentbattlefield) transforms((,newability[mustblock])) ueot])) ueot
+auto=@damaged(creature) from(creature[-attacking;-blocking]|mybattlefield) turnlimited:may name(Draw a card) draw:1 controller
+auto=@each my combatbegins:name(Pay and double creature's power) pay({2}{RG}) name(Pay and double creature's power) target(creature) transforms((,newability[p/0],,newability[_ATTACKING_ability$! notatarget(creature|myBattlefield) transforms((,newability[mustblock])) ueot!$ opponent])) ueot
 text=Whenever one or more creatures you control fight or become blocked, draw a card. -- At the beginning of combat on your turn, you may pay {2}{R} or {G}. If you do, double target creature's power until end of turn. That creature must be blocked this combat if able. ( {R} or {G} can be paid with either {R} or {G}.)
 mana={2}{G}{G}
 type=Legendary Creature
@@ -63901,7 +63901,7 @@ toughness=3
 [/card]
 [card]
 name=Raff, Weatherlight Stalwart
-auto=@movedTo(instant,sorcery|mystack):may transforms((,newability[tap notatarget(<2>creature[-tapped]|myBattlefield)],newability[draw:1])) oneshot
+auto=@movedTo(instant,sorcery|mystack) restriction{type(creature[-tapped]|myBattlefield)~morethan~1}:may transforms((,newability[tap notatarget(<2>creature[-tapped]|myBattlefield)],newability[draw:1])) oneshot
 auto={3}{W}{W}:all(creature|myBattlefield) transforms((,newability[1/1],newability[vigilance])) ueot
 text=Whenever you cast an instant or sorcery spell, you may tap two untapped creatures you control. If you do, draw a card. -- {3}{W}{W}: Creatures you control get +1/+1 and gain vigilance until end of turn.
 mana={W}{U}
@@ -84379,7 +84379,7 @@ toughness=3
 [/card]
 [card]
 name=The Prismatic Bridge
-auto=@each upkeep:name(Reveal cards) reveal:1 revealzone(mylibrary) revealuntil(*[creature;planeswalker]|mylibrary) optionone choice name(Put creature in play) target(*[creature;planeswalker]|reveal) moveto(ownerlibrary) and!( becomes(tobecast) ueot )! optiononeend optiontwo all(*|reveal) bottomoflibrary and!(shuffle)! optiontwoend afterrevealed all(tobecast|mylibrary) moveto(ownerlibrary) and!(moveTo(myBattlefield))! afterrevealedend revealend
+auto=@each my upkeep:name(Reveal cards) reveal:1 revealzone(mylibrary) revealuntil(*[creature;planeswalker]|mylibrary) optionone choice name(Put card onto the battlefield) target(*[creature;planeswalker]|reveal) moveto(ownerlibrary) and!( becomes(tobecast) ueot )! optiononeend optiontwo all(*|reveal) bottomoflibrary and!(shuffle)! optiontwoend afterrevealed all(tobecast|mylibrary) moveto(ownerlibrary) and!(moveTo(myBattlefield))! afterrevealedend revealend
 text=At the beginning of your upkeep, reveal cards from the top of your library until you reveal a creature or planeswalker card. Put that card onto the battlefield and the rest on the bottom of your library in a random order. // {1}{G}{G} Esika, God of the Tree
 mana={W}{U}{B}{R}{G}
 type=Legendary Enchantment
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 891234084..04e90ef1e 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -46399,7 +46399,7 @@ subtype=Aura
 [/card]
 [card]
 name=Gift of the Gargantuan
-aicode=activate target(<upto:2>creature,land[zpos<=4]|mylibrary) moveto(myhand)
+aicode=activate target(<upto:2>*[creature;land;zpos<=4]|mylibrary) moveto(myhand)
 auto=name(look) reveal:4 optionone name(Get a card) target(<upto:2>creature,land|reveal) moveto(myhand) optiononeend optiontwo name(put on bottom) target(<4>*|reveal) bottomoflibrary optiontwoend revealend
 text=Look at the top four cards of your library. You may reveal a creature card and/or a land card from among them and put the revealed cards into your hand. Put the rest on the bottom of your library in any order.
 mana={2}{G}