diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index c117dbd6d..7b1f3cc7f 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -7230,7 +7230,7 @@ toughness=2
 [/card]
 [card]
 name=Conclave Mentor
-auto=@counteradded(1/1) from(creature|myBattlefield):counter(1/1) all(trigger[from])
+auto=@counteradded(1/1) from(creature|mybattlefield) except(Conclave Mentor):may counter(1/1) target(creature[counter{1/1.1}]|myBattlefield)
 auto=@movedTo(this|graveyard) from(battlefield):life:power controller
 text=If one or more +1/+1 counters would be put on a creature you control, that many plus one +1/+1 counters are put on that creature instead. -- When Conclave Mentor dies, you gain life equal to its power.
 mana={G}{W}
@@ -17223,7 +17223,7 @@ toughness=2
 [/card]
 [card]
 name=Hardened Scales
-auto=@counteradded(1/1) from(creature|mybattlefield):all(trigger[from]) counter(1/1) limit:1
+auto=@counteradded(1/1) from(creature|mybattlefield) except(Hardened Scales):may counter(1/1) target(creature[counter{1/1.1}]|myBattlefield)
 text=If one or more +1/+1 counters would be placed on a creature you control, that many plus one +1/+1 counters are placed on it instead.
 mana={G}
 type=Enchantment
@@ -21864,7 +21864,7 @@ toughness=4
 [/card]
 [card]
 name=Lavabelly Sliver
-auto=lord(sliver|mybattlefield) transforms((,newability[@movedTo(mybattlefield) source(this):damage:1 target(*[planeswalker;player])]))
+auto=lord(sliver|mybattlefield) transforms((,newability[@movedTo(mybattlefield) from(this):damage:1 target(*[planeswalker;player])]))
 text=Sliver creatures you control have "When this creature enters the battlefield, it deals 1 damage to target player or planeswalker and you gain 1 life."
 mana={1}{R}{W}
 type=Creature
@@ -25155,7 +25155,7 @@ toughness=3
 [card]
 name=Mowu, Loyal Companion
 abilities=vigilance,trample
-auto=@counteradded(1/1) from(this) restriction{once}:counter(1/1)
+auto=@counteradded(1/1) from(this) except(Mowu, Loyal Companion):may counter(1/1)
 text=Trample, vigilance -- If one or more +1/+1 counters would be put on Mowu, Loyal Companion, that many plus one +1/+1 counters are put on it instead.
 mana={3}{G}
 type=Legendary Creature
@@ -40713,11 +40713,10 @@ type=Sorcery
 [/card]
 [card]
 name=Thought Erasure
-target=opponent
-aicode=activate reject notatarget(*[-land]|targetedpersonshand)
-auto=reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose discards) notatarget(<1>*[-land]|reveal) transforms((,newability[moveto(ownerhand) all(other *|reveal)],newability[moveto(ownerhand) and!(reject)!])) ueot optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
+aicode=activate reject notatarget(*[-land]|opponenthand)
+auto=reveal:type:*:opponenthand revealzone(opponenthand) optionone name(choose discards) notatarget(<1>*[-land]|reveal) transforms((,newability[moveto(ownerhand) all(other *|reveal)],newability[moveto(ownerhand) and!(reject)!])) ueot optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
 aicode=name(surveil) activate name(surveil) transforms((,newability[foreach(*[zpos<=1]|mylibrary) moverandom(*[zpos<=1]) from(mylibrary) to(mylibrary)])) ueot
-auto=name(surveil) reveal:1 optionone name(put in graveyard) target(<upto:1>*|reveal) moveto(ownergraveyard) optiononeend optiontwo name(put in library) target(<1>*|reveal) moveto(ownerlibrary) optiontwoend revealend controller
+auto=name(Reveal) reveal:1 optionone name(put in graveyard) target(<upto:1>*|reveal) moveto(ownergraveyard) optiononeend optiontwo name(put in library) target(<1>*|reveal) moveto(ownerlibrary) optiontwoend revealend
 text=Target opponent reveals their hand. You choose a nonland card from it. That player discards that card. -- Surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
 mana={U}{B}
 type=Sorcery
@@ -41321,7 +41320,7 @@ subtype=Arcane
 [/card]
 [card]
 name=Tolarian Kraken
-auto=@drawof(player):pay({1}) ability$!name(Choose one) choice name(tap target creature) target(creature) tap(noevent) _ choice name(tap target creature) target(creature) untap!$ controller
+auto=@drawof(player):pay({1}) ability$!name(Pay 1) choice name(Tap target creature) target(creature) tap(noevent) _ choice name(Untap target creature) target(creature) untap!$ controller
 text=Whenever you draw a card, you may pay 1 . When you do, you may tap or untap target creature.
 mana={4}{U}{U}
 type=Creature
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index d856cadc6..5a3415515 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -30124,7 +30124,8 @@ type=Sorcery
 [/card]
 [card]
 name=Distended Mindbender
-autostack=if casted(this) then choice name(discard opponent) target(opponent) reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose discard 3 or less) target(<1>*[manacost<4]]|reveal) moveto(ownerhand) and!( reject )! optiononeend optiontwo name(put back) target(<1>*[manacost>3]]|reveal) moveto(ownerhand) and!(reject)!  optiontwoend afterrevealed  all(*|reveal) moveto(ownerhand) afterrevealedend revealend
+autostack=if casted(this) then ability$!name(Reveal) reveal:type:*:opponenthand revealzone(opponenthand) optionone name(choose card with cost 3 or less) target(<1>*[-land;manacost<=3]|reveal) reject optiononeend optiontwo name(put back) all(*|reveal) moveto(opponenthand) optiontwoend revealend !$ controller
+autostack=if casted(this) then ability$!name(Reveal) reveal:type:*:opponenthand revealzone(opponenthand) optionone name(choose card with cost 4 or more) target(<1>*[manacost>=4]|reveal) reject optiononeend optiontwo name(put back) all(*|reveal) moveto(opponenthand) optiontwoend revealend !$ controller
 text=Emerge {5}{B}{B} (You may cast this spell by sacrificing a creature and paying the emerge cost reduced by that creature's converted mana cost.) -- When you cast Distended Mindbender, target opponent reveals his or her hand. You choose from it a nonland card with converted mana cost 3 or less and a card with converted mana cost 4 or greater. That player discards those cards.
 mana={8}
 other={emerge}{5}{B}{B} name(Emerge)
@@ -44393,7 +44394,8 @@ type=Instant
 [card]
 name=Galvanic Bombardment
 target=creature
-auto=damage:type:Galvanic Bombardment:mygraveyardplus2plusend
+auto=damage:2
+auto=foreach(Galvanic Bombardment|mygraveyard) damage:1
 text=Galvanic Bombardment deals X damage to target creature, where X is 2 plus the number of cards named Galvanic Bombardment in your graveyard.
 mana={R}
 type=Instant
@@ -87734,7 +87736,7 @@ toughness=1
 name=Praetor's Counsel
 auto=moveTo(exile)
 auto=moveTo(myhand) all(*|mygraveyard)
-autoexile=lord(*|myBattlefield) nomaxhand
+autoexile=emblem transforms((,newability[lord(*|myBattlefield) nomaxhand])) forever dontremove
 text=Return all cards from your graveyard to your hand. Exile Praetor's Counsel. You have no maximum hand size for the rest of the game.
 mana={5}{G}{G}{G}
 type=Sorcery
diff --git a/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt b/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
index cc7d9c868..5ef40b785 100644
--- a/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
+++ b/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
@@ -171,7 +171,7 @@ subtype=Ajani
 [card]
 name=Ajani, Wise Counselor
 auto=counter(0/0,5,loyalty)
-auto={C(0/0,1,Loyalty)}:name(+1: Gain 1 life for each creature) foreach(creature|myBattlefield) life:type:creature:myBattlefield controller
+auto={C(0/0,2,Loyalty)}:name(+2: Gain 1 life for each creature) life:type:creature:myBattlefield controller
 auto={C(0/0,-3,Loyalty)}:name(-3: Creatures gets +2/+2) all(creature|myBattlefield) 2/2 ueot
 auto={C(0/0,-9,Loyalty)}:name(-9: Put X +1/+1 counter) counter(1/1,lifetotal) target(creature)
 text=+2: You gain 1 life for each creature you control. -- −3: Creatures you control get +2/+2 until end of turn. -- −9: Put X +1/+1 counters on target creature, where X is your life total.