diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index 52b1e575e..417379674 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -2756,7 +2756,7 @@ toughness=4
 name=Angel of the Ruins
 abilities=flying
 aicode=activate target(plains|mylibrary) moveto(hand)
-autohand={2}{cycle}:name(search plain) Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(<1>plains|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(hand)])) optiononeend optiontwo name(shuffle) bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary and!(shuffle)! )! optiontwoend revealend
+autohand={2}{cycle}:name(search plains) Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(<1>plains|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(hand)])) optiononeend optiontwo name(shuffle) bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary and!(shuffle)! )! optiontwoend revealend
 auto=target(<upto:2>*[artifact;enchantment]|battlefield) moveto(exile)
 text=Flying -- When Angel of the Ruins enters, exile up to two target artifacts and/or enchantments. -- Plainscycling {2} ({2}, Discard this card: Search your library for a Plains card, reveal it, put it into your hand, then shuffle.)
 mana={5}{W}{W}
@@ -7111,7 +7111,7 @@ type=Instant
 [card]
 name=Bandit's Talent
 auto=counter(0/0,1,Level)
-auto=ability$! name(discard 2 cards) choice name(discard 2 cards) target(<2>*|myhand) reject _ if type(*[-land]|myhand)~morethan~0 then name(discard artifact) choice name(discard artifact) target(*[-land]|myhand) reject !$ opponent
+auto=ability$! name(discard 2 cards) choice name(discard 2 cards) target(<2>*|myhand) reject _ if type(*[-land]|myhand)~morethan~0 then name(discard artifact) choice name(discard nonland) target(*[-land]|myhand) reject !$ opponent
 auto=this(variable{hascntlevel}=1) {B}:name(Level 2) counter(0/0,1,Level) asSorcery
 auto=@each opponent upkeep restriction{compare(hascntlevel)~morethan~1,type(*|opponenthand)~lessthan~2}:life:-2 opponent
 auto=this(variable{hascntlevel}=2) {3}{B}:name(Level 3) counter(0/0,1,Level) asSorcery
@@ -24287,6 +24287,7 @@ type=Enchantment
 name=Deadly Dispute
 auto=draw:2 controller
 auto=_TREASURE_
+restriction=type(*[creature;artifact]|myBattlefield)~morethan~0
 text=As an additional cost to cast this spell, sacrifice an artifact or creature. -- Draw two cards and create a Treasure token. (it's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
 mana={1}{B}{S(*[creature;artifact]|myBattlefield)}
 type=Instant
@@ -38299,8 +38300,8 @@ name=Flubs, the Fool
 auto=maxPlay(land)+1
 auto=@movedTo(mybattlefield) from(land|myhandexilegrave) restriction{type(*|myhand)~equalto~0}:draw:1
 auto=@movedTo(mybattlefield) from(land|myhandexilegrave) restriction{type(*|myhand)~morethan~0}:ability$!name(discard) reject notatarget(*|myhand)!$ controller
-auto=@movedto(*|stack) from(*|mycastingzone) restriction{type(*|myhand)~equalto~0}:draw:1
 auto=@movedto(*|stack) from(*|mycastingzone) restriction{type(*|myhand)~morethan~0}:ability$!name(discard) reject notatarget(*|myhand)!$ controller
+auto=@movedto(*|stack) from(*|mycastingzone) restriction{type(*|myhand)~equalto~0}:draw:1
 text=You may play an additional land on each of your turns. -- Whenever you play a land or cast a spell, draw a card if you have no cards in hand. Otherwise, discard a card.
 mana={G}{U}{R}
 type=Legendary Creature
@@ -69978,7 +69979,7 @@ toughness=4
 name=Ms. Bumbleflower
 abilities=vigilance
 auto=@movedTo(*|mystack):ability$! target(opponent) draw:1 targetedplayer !$ controller
-auto=@movedTo(*|mystack):target(creature) transforms((,newability[counter(1/1)],newability[flying])) ueot
+auto=@movedTo(*|mystack):name(Bumbleflower counter) target(creature) transforms((,newability[counter(1/1)],newability[flying])) ueot
 auto=@movedTo(*|mystack) turnlimited:all(this) becomes(Bumbleflower) ueot
 auto=@movedTo(*|mystack) restriction{thisturn(*|mystack)~equalto~1}:if this(cantargetcard(*[Bumbleflower]) then draw:2
 text=Vigilance -- Whenever you cast a spell, target opponent draws a card. Put a +1/+1 counter on target creature. It gains flying until end of turn. If this is the second time this ability has resolved this turn, you draw two cards.
@@ -74390,7 +74391,7 @@ subtype=Saga
 [/card]
 [card]
 name=Okiba Salvage
-target=*[creature;vehicle]|mybattlefield
+target=*[creature;vehicle]|myGraveyard
 auto=moveTo(mybattlefield) and!( transforms((,newability[if type(artifact|myBattlefield)~morethan~0 then if type(enchantment|myBattlefield)~morethan~0 then name(Put 1/1 counter) name(Put 1/1 counter) name(Put 1/1 counter) counter(1/1.2)])) oneshot )!
 text=Return target creature or Vehicle card from your graveyard to the battlefield. Then put two +1/+1 counters on that permanent if you control an artifact and an enchantment.
 mana={4}{B}
@@ -79430,8 +79431,8 @@ subtype=Arcane
 [/card]
 [card]
 name=Plumb the Forbidden
-target=<anyamount>creature|mybattlefield
-auto=transforms((,newability[sacrifice],newability[draw:1 controller],newability[life:-1 controller])) oneshot
+auto=target(<anyamount>creature|mybattlefield) transforms((,newability[sacrifice],newability[draw:1 controller],newability[life:-1 controller])) oneshot
+auto=draw:1 && life:-1
 text=As an additional cost to cast this spell, you may sacrifice one or more creatures. When you do, copy this spell for each creature sacrificed this way. -- You draw a card and you lose 1 life.
 mana={1}{B}
 type=Instant
diff --git a/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt b/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
index ae164c760..7c45db90c 100644
--- a/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
+++ b/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
@@ -3397,8 +3397,8 @@ name=Tezzeret, Betrayer of Flesh
 #MISSING: The first activated ability of an artifact you activate each turn costs {2} less to activate.
 auto=counter(0/0,4,loyalty)
 auto={C(0/0,+1,Loyalty)}:name(+1: Draw and discard) draw:2 controller && transforms((,newability[if type(artifact|myhand)~morethan~0 then choice name(Discard artifact) name(Discard artifact) notatarget(artifact|myhand) reject],newability[if type(*[-artifact]|myhand)~morethan~1 then choice name(Don't discard artifact) name(Don't discard artifact) notatarget(<2>*[-artifact]|myhand) reject])) ueot
-auto={C(0/0,-2,Loyalty)}:name(-2: Artifact becomes creature) target(artifact|battlefield) transforms((,newability[if cantargetcard(*[vehicle]|*) then becomes(Artifact Creature) ueot else becomes(Artifact Creature^4/4) ueot])) ueot
-auto={C(0/0,-6,Loyalty)}:name(-6: Emblem on tapped artifact) emblem transforms((,newability[@tapped(artifact|battlefield):name(Draw a card) draw:1 controller])) forever dontremove
+auto={C(0/0,-2,Loyalty)}:name(-2: Artifact becomes creature) target(artifact) transforms((,newability[if cantargetcard(*[vehicle]|*) then becomes(Artifact Creature) forever else becomes(Artifact Creature^4/4) forever])) forever
+auto={C(0/0,-6,Loyalty)}:name(-6: Emblem on tapped artifact) emblem transforms((,newability[@tapped(artifact|mybattlefield):name(Draw a card) draw:1 controller])) forever dontremove
 text=The first activated ability of an artifact you activate each turn costs {2} less to activate. -- [+1]: Draw two cards. Then discard two cards unless you discard an artifact card. -- [-2]: Target artifact becomes an artifact creature. If it isn't a Vehicle, it has base power and toughness 4/4. -- [-6]: You get an emblem with "Whenever an artifact you control becomes tapped, draw a card."
 mana={2}{U}{U}
 type=Legendary Planeswalker