diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index cd4b7220e..cbcd91655 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -3853,7 +3853,7 @@ abilities=indestructible
 auto=this(variable{orzhov}<7) transforms((removetypes,newability[becomes(Legendary Enchantment God)]))
 auto=this(variable{orzhov}>6) transforms((Legendary Enchantment Creature))
 auto=@each my endofturn:counter(0/0,1,Coin) target(other creature|battlefield)
-auto=@movedto(creature[counter{0/0.1.Coin}]|graveyard,exile):name(Return on battlefield) all(trigger[to]) name(Return on battlefield) moveTo(mybattlefield)
+auto=@movedto(creature[counter{0/0.1.Coin}]|graveyard,exile):name(Return to battlefield) all(trigger[to]) moveTo(mybattlefield)
 text=Indestructible -- As long as your devotion to white and black is less than seven, Athreos isn't a creature. -- At the beginning of your end step, put a coin counter on another target creature. -- Whenever a creature with a coin counter on it dies or is put into exile, return that card to the battlefield under your control.
 mana={4}{W}{B}
 type=Legendary Enchantment Creature
@@ -4561,7 +4561,7 @@ toughness=3
 [/card]
 [card]
 name=Azra Bladeseeker
-auto=may ability$!name(discard) reject notatarget(*|myhand)!$ and!(draw:1)!
+auto=may reject notatarget(*|myhand) and!( draw:1 controller )!
 text=When Azra Bladeseeker enters the battlefield, each player on your team may discard a card, then each player who discarded a card this way draws a card.
 mana={2}{R}
 type=Creature
@@ -13621,12 +13621,12 @@ subtype=Equipment
 [/card]
 [card]
 name=Commander's Sphere
-auto={S}:name(Sacrifice and draw) draw:1 controller
-auto=aslongas(*[iscommander&red]|myzones) {T}:add{R}
 auto=aslongas(*[iscommander&white]|myzones) {T}:add{W}
-auto=aslongas(*[iscommander&green]|myzones) {T}:add{G}
 auto=aslongas(*[iscommander&blue]|myzones) {T}:add{U}
 auto=aslongas(*[iscommander&black]|myzones) {T}:add{B}
+auto=aslongas(*[iscommander&red]|myzones) {T}:add{R}
+auto=aslongas(*[iscommander&green]|myzones) {T}:add{G}
+auto={S}:name(Sacrifice and draw) draw:1 controller
 text={T}: Add to your mana pool one mana of any color in your commander's color identity. -- Sacrifice Commander's Sphere: Draw a card.
 mana={3}
 type=Artifact
@@ -13984,11 +13984,11 @@ type=Sorcery
 [card]
 name=Conqueror's Flail
 auto={2}:equip
-auto=aslongas(*[white]|myBattlefield) teach(creature) 1/1
-auto=aslongas(*[blue]|myBattlefield) teach(creature) 1/1
-auto=aslongas(*[black]|myBattlefield) teach(creature) 1/1
-auto=aslongas(*[red]|myBattlefield) teach(creature) 1/1
-auto=aslongas(*[green]|myBattlefield) teach(creature) 1/1
+auto=aslongas(*[white]|myBattlefield) 1/1 >0
+auto=aslongas(*[blue]|myBattlefield) 1/1 >0
+auto=aslongas(*[black]|myBattlefield) 1/1 >0
+auto=aslongas(*[red]|myBattlefield) 1/1 >0
+auto=aslongas(*[green]|myBattlefield) 1/1 >0
 auto=teach(creature) this(variable{controllerturn}) maxCast(*)0 opponent
 text=Equipped creature gets +1/+1 for each color among permanents you control. -- As long as Conqueror's Flail is attached to a creature, your opponents can't cast spells during your turn. -- Equip {2}
 mana={2}
@@ -25045,7 +25045,7 @@ name=Feral Roar
 target=creature
 auto=4/4 ueot
 text=Target creature gets +4/+4 until end of turn.
-mana={1}{B}
+mana={1}{G}
 type=Instant
 [/card]
 [card]
@@ -31809,7 +31809,8 @@ type=Sorcery
 [/card]
 [card]
 name=Gruesome Scourger
-auto=damage:type:creature:mybattlefield target(planeswalker,opponent)
+auto=name(target opponent) damage:type:creature:mybattlefield target(opponent)
+auto=name(target planeswalker) damage:type:creature:mybattlefield target(planeswalker)
 text=When Gruesome Scourger enters the battlefield, it deals damage to target opponent or planeswalker equal to the number of creatures you control.
 mana={3}{B}{B}
 type=Creature
@@ -36601,7 +36602,7 @@ type=Instant
 [card]
 name=Indulgent Tormentor
 abilities=flying
-auto=@each my upkeep:ability$!choice name(draw 1 opponent) draw:1 opponent _ choice name(pay 2 life) life:-2!$ opponent
+auto=@each my upkeep:ability$!choice name(draw 1 opponent) draw:1 opponent _ choice name(pay 3 life) life:-3!$ opponent
 text=Flying -- At the beginning of your upkeep, draw a card unless target opponent sacrifices a creature or pays 3 life.
 mana={3}{B}{B}
 type=Creature
@@ -38333,7 +38334,7 @@ backside=Ormendahl, the Corrupter
 restriction=compare(isflipped)~equalto~0
 anyzone={0}:doubleside(backside)
 auto=life:-1 controller && token(Human,Creature Human,1/1,white)
-auto=movedto(creature[human]|graveyard) from(mybattlefield):name(Lose 1 life and create human) life:-1 controller && token(Human,Creature Human,1/1,white)
+auto=@movedto(other human[-token]|graveyard) from(mybattlefield):name(Lose 1 life and create human) life:-1 controller && token(Human,Creature Human,1/1,white)
 auto=@each my endofturn restriction{compare(lifetotal)~equalto~13}:may name(Transform Jerren) pay({4}{B}{B}) name(Transform Jerren) flip(backside)
 auto={2}:name(Human gains lifelink) target(creature[human]|mybattlefield) transforms((,newability[lifelink])) ueot
 text=Whenever Jerren, Corrupted Bishop enters the battlefield or another nontoken Human you control dies, you lose 1 life and create a 1/1 white Human creature token -- {2}: Target Human you control gains lifelink until end of turn. -- At the beginning of your end step, if you have exactly 13 life, you may pay {4}{B}{B}. If you do, transform Jerren. // Ormendahl, the Corrupter
@@ -38538,9 +38539,8 @@ toughness=5
 [/card]
 [card]
 name=Journey for the Elixir
-aicode=activate target(land[basic]|mylibrary,mygraveyard) moveto(myhand)
-auto=name(search a basic land card) Reveal:type:*:mylibrary,mygraveyard revealzone(mylibrary,mygraveyard) optionone name(choose a basic land card) target(<1>land[basic]|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary,mygraveyard) and!(shuffle)!],newability[moveto(myhand)])) optiononeend optiontwo name(shuffle) bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary and!(shuffle)! )! optiontwoend revealend
-auto=may moveto(myhand) target(Jiang Yanggu|mylibrary,mygraveyard) && shuffle
+auto=activate notatarget(basic|mylibrary,mygraveyard) moveto(myhand)
+auto=moverandom(Jiang Yanggu) from(mylibrary) to(myhand)
 text=Search your library and graveyard for a basic land card and a card named Jiang Yanggu, reveal them, put them into your hand, then shuffle your library.
 mana={2}{G}
 type=Sorcery
@@ -44208,7 +44208,7 @@ type=Enchantment
 [card]
 name=Magmatic Sinkhole
 other={delve} name(Delve)
-auto=damage:2 target(planeswalker,creature)
+auto=damage:5 target(planeswalker,creature)
 text=Delve (Each card you exile from your graveyard while casting this spell pays for {1}.) -- Magmatic Sinkhole deals 5 damage to target creature or planeswalker.
 mana={5}{R}
 type=Instant
@@ -45068,7 +45068,12 @@ toughness=1
 [card]
 name=Martyr's Bond
 auto=_DIES_ability$!sacrifice notatarget(enchantment|mybattlefield)!$ opponent
-auto=@movedto(*[-land]|graveyard) from(battlefield):ability$!sacrifice notatarget(*[-land,share!types!]|mybattlefield)!$ opponent
+auto=@movedto(Artifact[-Creature]|graveyard) from(mybattlefield):ability$!sacrifice notatarget(Artifact|mybattlefield)!$ opponent
+auto=@movedto(Artifact[Creature]|graveyard) from(mybattlefield):ability$!sacrifice notatarget(*[Artifact;Creature]|mybattlefield)!$ opponent
+auto=@movedto(Creature|graveyard) from(mybattlefield):ability$!sacrifice notatarget(Creature|mybattlefield)!$ opponent
+auto=@movedto(Enchantment[-Creature]|graveyard) from(mybattlefield):ability$!sacrifice notatarget(Enchantment|mybattlefield)!$ opponent
+auto=@movedto(Enchantment[Creature]|graveyard) from(mybattlefield):ability$!sacrifice notatarget(*[Enchantment;Creature]|mybattlefield)!$ opponent
+auto=@movedto(Planeswalker|graveyard) from(mybattlefield):ability$!sacrifice notatarget(Planeswalker|mybattlefield)!$ opponent
 text=Whenever Martyr's Bond or another nonland permanent you control is put into a graveyard from the battlefield, each opponent sacrifices a permanent that shares a card type with it.
 mana={4}{W}{W}
 type=Enchantment
@@ -46461,8 +46466,7 @@ toughness=1
 [/card]
 [card]
 name=Mire in Misery
-target=opponent
-auto=ability$!name(sacrifice) notatarget(*[creature,enchantment]|myBattlefield) sacrifice!$ opponent
+auto=ability$!name(sacrifice) notatarget(*[creature;enchantment]|mybattlefield) sacrifice!$ opponent
 text=Each opponent sacrifices a creature or enchantment.
 mana={1}{B}
 type=Sorcery
@@ -52656,7 +52660,7 @@ type=Instant
 [card]
 name=Persist
 target=creature[-legendary]|mygraveyard
-auto=moveto(myBattlefield) and!( counter(-1/-1) )!
+auto=moveto(myBattlefield) and!(counter(-1/-1))!
 text=Return target nonlegendary creature card from your graveyard to the battlefield with a -1/-1 counter on it.
 mana={1}{B}
 type=Sorcery
@@ -53278,7 +53282,7 @@ color=red
 [/card]
 [card]
 name=Pirate's Cutlass
-auto=name(Attach to creature) rehook target(creature|myBattlefield)
+auto=name(Attach to Pirate) rehook target(pirate|myBattlefield)
 auto=teach(creature) 2/1
 auto={2}:equip
 text=When Pirate's Cutlass enters the battlefield, attach it to target Pirate you control. -- Equipped creature gets +2/+1. -- Equip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
@@ -55268,7 +55272,7 @@ type=Instant
 [/card]
 [card]
 name=Pull from Tomorrow
-auto=draw:X && reject notatarget(*|myhand)
+auto=draw:X && transforms((,newability[target(*|myhand) reject])) forever
 text=Draw X cards, then discard a card.
 mana={X}{U}{U}
 type=Instant
@@ -57772,7 +57776,7 @@ name=Release to the Wind
 target=*[-land]|battlefield
 auto=moveto(exile) and!( transforms((,canplayfromexile)) forever )!
 text=Exile target nonland permanent. For as long as that card remains exiled, its owner may cast it without paying its mana cost.
-mana={2}{B}
+mana={2}{U}
 type=Instant
 [/card]
 [card]
@@ -60255,9 +60259,9 @@ name=Ruin Grinder
 abilities=menace
 aicode=activate moveTo(myhand) target(mountain|myLibrary)
 autohand={2}{cycle}:name(search card) reveal:plibrarycount optionone name(choose card) target(mountain|reveal) moveto(ownerlibrary) and!( becomes(tobecast) ueot )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerlibrary) and!( all(*|reveal) moveto(ownerlibrary) and!(shuffle)! )! optiontwoend afterrevealed all(tobecast|mylibrary) moveto(ownerlibrary) and!(moveto(myhand))! afterrevealedend revealend
-auto=reject all(*|hand)
-auto=draw:7 opponent
-auto=draw:7 controller
+auto=_DIES_draw:7 opponent
+auto=_DIES_draw:7 controller
+auto=_DIES_reject all(*|hand)
 text=Menace -- When Ruin Grinder dies, each player may discard their hand and draw seven cards. -- Mountaincycling {2} ({2}, Discard this card: Search your library for a Mountain card, reveal it, put it into your hand, then shuffle.)
 mana={5}{R}
 type=Artifact Creature
@@ -64806,9 +64810,9 @@ toughness=2
 [/card]
 [card]
 name=Sidisi, Brood Tyrant
+auto=@movedTo(creature|myGraveyard) from(mylibrary):_ZOMBIETOKEN_
 auto=deplete:3 controller
 auto=_ATTACKING_deplete:3 controller
-auto=@movedTo(creature|myGraveyard) from(mylibrary):_ZOMBIETOKEN_
 text=Whenever Sidisi, Brood Tyrant enters the battlefield or attacks, put the top three cards of your library into your graveyard. -- Whenever one or more creature cards are put into your graveyard from your library, put a 2/2 black Zombie creature token onto the battlefield.
 mana={1}{B}{G}{U}
 type=Legendary Creature
@@ -65735,7 +65739,7 @@ toughness=0
 [card]
 name=Sixth Sense
 target=creature
-auto=@combatdamaged(player) from(this):may draw:1
+auto=@combatdamaged(player) from(mytgt):may draw:1
 text=Enchant creature -- Enchanted creature has "Whenever this creature deals combat damage to a player, you may draw a card."
 mana={G}
 type=Enchantment
@@ -66794,7 +66798,8 @@ toughness=3
 [/card]
 [card]
 name=Smiting Helix
-auto=damage:3 target(player,creature,planeswalker)
+target=player,creature,planeswalker
+auto=damage:3 
 auto=life:3 controller
 flashback={R}{W}
 text=Smiting Helix deals 3 damage to any target and you gain 3 life. -- Flashback {R}{W} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
@@ -69699,8 +69704,8 @@ type=Sorcery
 [/card]
 [card]
 name=Static Orb
-auto=@each my beginofturn sourcenottap:lord(*|battlefield) doesnotuntap && untap target(*)*2
-auto=@each opponent beginofturn sourcenottap:lord(*|battlefield) doesnotuntap && untap target(*)*2
+auto=@each my beginofturn sourcenottap:lord(*|battlefield) doesnotuntap && target(*)*2 untap
+auto=@each opponent beginofturn sourcenottap:lord(*|battlefield) doesnotuntap && target(*)*2 untap
 text=As long as Static Orb is untapped, players can't untap more than two permanents during their untap steps.
 mana={3}
 type=Artifact
@@ -72230,8 +72235,8 @@ type=Instant
 name=Taborax, Hope's Demise
 abilities=flying
 auto=this(counter{1/1.1}>4) lifelink
-auto=@movedTo(other cleric[-token]|myGraveyard) from(Battlefield):may draw:1 controller && life:-1 controller
-auto=@movedTo(other creature[-token]|myGraveyard) from(Battlefield):counter(1/1) all(this)
+auto=@movedTo(other cleric[-token]|graveyard) from(myBattlefield):may draw:1 controller && life:-1 controller
+auto=@movedTo(other creature[-token]|graveyard) from(myBattlefield):counter(1/1) all(this)
 text=Flying -- Taborax, Hope's Demise has lifelink as long as it has five or more +1/+1 counters on it. -- Whenever another nontoken creature you control dies, put a +1/+1 counter on Taborax. If that creature was a Cleric, you may draw a card. If you do, you lose 1 life.
 mana={2}{B}
 type=Legendary Creature
@@ -76001,8 +76006,8 @@ type=Sorcery
 name=Tourach, Dread Cantor
 abilities=protection from white
 kicker={B}{B}
-auto=if paid(kicker) then discard:2 opponent
 auto=@discarded(*|opponenthand):counter(1/1)
+auto=if paid(kicker) then discard:2 opponent
 text=Kicker {B}{B} (You may pay an additional {B}{B} as you cast this spell.) -- Protection from white -- Whenever an opponent discards a card, put a +1/+1 counter on Tourach, Dread Cantor. -- When Tourach enters the battlefield, if it was kicked, target opponent discards two cards at random.
 mana={1}{B}
 type=Legendary Creature
@@ -76542,7 +76547,7 @@ toughness=7
 [card]
 name=Trespasser's Curse
 target=player
-auto=@movedto(creature|opponentbattlefield):life:-1 targetedplayer && life:1 targetedplayer
+auto=@movedto(creature|opponentbattlefield):life:-1 opponent && life:1 controller
 text=Enchant player -- Whenever a creature enters the battlefield under enchanted player's control, that player loses 1 life and you gain 1 life.
 mana={1}{B}
 type=Enchantment
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 82d85dda0..e28bc01fb 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -39015,7 +39015,7 @@ type=Sorcery
 [/card]
 [card]
 name=Farbog Boneflinger
-auto=-2/-2 target(creature)
+auto=-2/-2 target(creature) ueot
 text=When Fargog Boneflinger enters the battlefield, target creature gets -2/-2 until end of turn.
 mana={4}{B}
 type=Creature
@@ -66970,7 +66970,7 @@ type=Sorcery
 name=Life's Legacy
 auto=draw:storedpower controller
 text=As an additional cost to cast Life's Legacy, sacrifice a creature. -- Draw cards equal to the sacrificed creature's power.
-mana={1}{G}
+mana={1}{G}{S(creature|mybattlefield)}
 type=Sorcery
 [/card]
 [card]
@@ -68402,7 +68402,7 @@ toughness=2
 [/card]
 [card]
 name=Loreseeker's Stone
-auto={value:type:*:myhandplus3plusend}{T}:draw:3 controller
+auto={3}{value:type:*:myhand cdaactive}{T}:draw:3 controller
 text={3}, {T}: Draw three cards. This ability costs {1} more to activate for each card in your hand.
 mana={6}
 type=Artifact
@@ -71675,7 +71675,7 @@ subtype=Aura
 [/card]
 [card]
 name=Mask of Memory
-auto=@damaged(player) from(mytgt):may draw:2 controller && reject target(*|myhand)
+auto=@damaged(player) from(mytgt):may draw:2 && transforms((,newability[target(*|myhand) reject])) forever
 text=Whenever equipped creature deals combat damage to a player, you may draw two cards. If you do, discard a card. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.)
 auto={1}:equip
 mana={2}
@@ -81463,7 +81463,7 @@ type=Artifact
 [/card]
 [card]
 name=Obelisk of Urd
-auto=chooseatype lord(creature[chosentype]) +2/+2 chooseend
+auto=chooseatype lord(creature[chosentype]|myBattlefield) +2/+2 chooseend
 text=Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spell pays for {1} or one mana of that creature's color.) -- As Obelisk of Urd enters the battlefield, choose a creature type. -- Creatures you control of the chosen type get +2/+2.
 other={convoke} name(Convoke)
 mana={6}
@@ -91064,7 +91064,6 @@ name=Rage of Purphoros
 target=creature
 auto=cantregen
 auto=damage:4
-aicode=activate transforms((,newability[all(*[zpos<=4]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
 auto=scry:1 scrycore delayed dontshow donothing scrycoreend scryend
 text=Rage of Purphoros deals 4 damage to target creature. It can't be regenerated this turn. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={4}{R}
@@ -95507,7 +95506,7 @@ subtype=Equipment
 [/card]
 [card]
 name=Ring of Renewal
-auto={d}{5}{T}:draw:2 controller
+auto={5}{T}:discard:1 controller && draw:2 controller
 text={5}, {T}: Discard a card at random, then draw two cards.
 mana={5}
 type=Artifact
@@ -105822,7 +105821,7 @@ toughness=2
 [card]
 name=Silverfur Partisan
 abilities=trample
-auto=@targeted(wolf,werewolf|mybattlefield) from(instant,sorcery):_WOLFTOKEN_
+auto=@targeted(wolf,Werewolf|mybattlefield) from(*[instant;sorcery]|myCastingzone):_WOLFTOKEN_
 text=Trample -- Whenever a Wolf or Werewolf you control becomes the target of an instant or sorcery spell, put a 2/2 green Wolf creature token onto the battlefield.
 mana={2}{G}
 type=Creature
@@ -123575,7 +123574,8 @@ toughness=*
 [/card]
 [card]
 name=Trash for Treasure
-auto=moveTo(myBattlefield) target(artifact|mygraveyard)
+target=artifact|mygraveyard
+auto=moveTo(myBattlefield) 
 text=As an additional cost to cast Trash for Treasure, sacrifice an artifact. -- Return target artifact card from your graveyard to the battlefield.
 mana={2}{R}{S(artifact|mybattlefield)}
 type=Sorcery
@@ -133901,7 +133901,7 @@ toughness=2
 [/card]
 [card]
 name=Wild Defiance
-auto=@targeted(creature|mybattlefield) from(*[instant;sorcery]|nonbattlezone,stack):all(trigger[to]) 3/3 ueot
+auto=@targeted(creature|mybattlefield) from(*[instant;sorcery]|myCastingzone):all(trigger[to]) 3/3 ueot
 text=Whenever a creature you control becomes the target of an instant or sorcery spell, that creature gets +3/+3 until end of turn.
 mana={2}{G}
 type=Enchantment
diff --git a/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt b/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
index b5894021d..56eea269f 100644
--- a/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
+++ b/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
@@ -2864,7 +2864,7 @@ subtype=Tezzeret
 name=Tezzeret, Artifice Master
 auto=counter(0/0,5,loyalty)
 auto={C(0/0,1,Loyalty)}:name(+1: Create a 1/1 Thopter) token(Thopter,Artifact Creature Thopter,1/1,flying)
-auto={C(0/0,0,Loyalty)}:name(+0: Draw a card or two) if type(artifact|myBattlefield)~morethan~2 draw:2 controller else draw:1 controller
+auto={C(0/0,0,Loyalty)}:name(+0: Draw a card or two) if type(artifact|myBattlefield)~morethan~2 then draw:2 controller else draw:1 controller
 auto={C(0/0,-9,Loyalty)}:name(-9: Emblem: Each end of turn search a permanent) emblem transforms((,newability[@each my endofturn:moveTo(myBattlefield) target(*[-instant;-sorcery]|myLibrary) && shuffle controller])) forever dontremove
 text=+1: Create a 1/1 colorless Thopter artifact creature token with flying. -- 0: Draw a card. If you control three or more artifacts, draw two cards instead. -- −9: You get an emblem with "At the beginning of your end step, search your library for a permanent card, put it onto the battlefield, then shuffle your library."
 mana={3}{U}{U}