diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index 6f5f603ba..aeaf242bf 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -31587,7 +31587,8 @@ toughness=3
 [/card]
 [card]
 name=Enduring Bondwarden
-auto=name(Put counter on creature) target(creature|battlefield) transforms((,newability[counter(1/1)],newability[_DIES_this(counter{1/1}>=1) name(Move 1/1 counters) target(creature|myBattlefield) counter(1/1.hasnct11)])) forever
+auto=name(Put counter on creature) target(creature|battlefield) transforms((,newability[counter(1/1)],newability[_DIES_choice thisforeach(counter{1/1}) counter(1/1) target(creature|mybattlefield)])) forever
+auto=_DIES_choice thisforeach(counter{1/1}) counter(1/1) target(creature|mybattlefield)
 text=Backup 1 (When this creature enters, put a +1/+1 counter on target creature. If that's another creature, it gains the following ability until end of turn.) -- When this creature dies, put its counters on target creature you control.
 mana={W}
 type=Creature
@@ -42562,7 +42563,7 @@ type=Instant
 [card]
 name=Glyph of Life
 auto=@damaged(wall) from(creature[attacking]):life:thatmuch controller ueot
-text=Until end of turn, whenever an attacking creature deals damage to target Wall creature, you gain that much life.
+text=Choose target Wall creature. Whenever that creature is dealt damage by an attacking creature this turn, you gain that much life.
 mana={W}
 type=Instant
 [/card]
@@ -75840,7 +75841,7 @@ subtype=Equipment
 name=Parish-Blade Trainee
 abilities=training
 auto=_TRAINING_
-auto=_DIES_this(counter{1/1}>=1) name(Move 1/1 counters) target(creature|myBattlefield) counter(1/1,hasnct11)
+auto=_DIES_choice thisforeach(counter{1/1}) counter(1/1) target(creature|mybattlefield)
 text=Training (Whenever this creature attacks with another creature with greater power, put a +1/+1 counter on this creature.) -- When Parish-Blade Trainee dies, put its counters on target creature you control.
 mana={1}{W}
 type=Creature
@@ -93602,7 +93603,8 @@ subtype=Equipment
 [card]
 name=Shiny Impetus
 target=creature
-auto=teach(creature) transforms((,newability[counter(0/0.1.Goaded)],newability[this(counter{0/0.1.Goaded}>0) mustattack],newability[_ATTACKING__TREASURE_]))
+auto=teach(creature) transforms((,newability[counter(0/0.1.Goaded)],newability[this(counter{0/0.1.Goaded}>0) mustattack]))
+auto=@combat(attacking) source(mytgt):_TREASURE_
 auto=2/2
 text=Enchanted creature gets +2/+2 and is goaded. (It attacks each combat if able and attacks a player other than you if able.) -- Whenever enchanted creature attacks, you create a Treasure token. (It's an artifact with "Tap, Sacrifice this artifact: Add one mana of any color.")
 mana={2}{R}
@@ -119179,8 +119181,8 @@ toughness=4
 [card]
 name=Witch of the Moors
 abilities=deathtouch
-auto=@each endofturn restriction{compare(lifegain)~morethan~0}:ability$!sacrifice notatarget(creature|mybattlefield)!$ opponent
-auto=@each endofturn restriction{compare(lifegain)~morethan~0}:moveto(ownerHand) target(creature|mygraveyard)
+auto=@each my endofturn restriction{compare(lifegain)~morethan~0}:ability$!sacrifice notatarget(creature|mybattlefield)!$ opponent
+auto=@each my endofturn restriction{compare(lifegain)~morethan~0}:moveto(ownerHand) target(creature|mygraveyard)
 text=Deathtouch -- At the beginning of your end step, if you gained life this turn, each opponent sacrifices a creature and you return up to one target creature card from your graveyard to your hand.
 mana={3}{B}{B}
 type=Creature
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index fdeb28888..ae1b9edcb 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -70917,7 +70917,7 @@ toughness=2
 [card]
 name=Marauding Maulhorn
 abilities=mustattack
-auto=aslongas(Advocate of the Beast|mybattlefield)transforms((,newability[-mustattack]))
+auto=aslongas(Advocate of the Beast|mybattlefield) transforms((,newability[-mustattack]))
 text=Maurading Maulhorn attacks each combat if able unless you control a creature named Advocate of the Beast.
 mana={2}{R}{R}
 type=Creature