diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index db52d14aa..46c30a85b 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -28907,7 +28907,7 @@ type=Sorcery
 [/card]
 [card]
 name=Drillworks Mole
-auto={2}{T}:counter(1/1) all(this) && target(creature[iscommander]|myBattlefield) counter(1/1)
+auto={2}{T}:counter(1/1) all(this) && ability$! may target(creature[iscommander]|myBattlefield) counter(1/1) !$ controller 
 text={2}, {T}: Put a +1/+1 counter on Drillworks Mole and a +1/+1 counter on up to one target commander creature you control.
 mana={1}
 type=Artifact Creature
@@ -44744,7 +44744,7 @@ name=Gossip's Talent
 auto=counter(0/0,1,Level)
 auto=@movedto(creature|myBattlefield):_SURVEIL1_
 auto=this(variable{hascntlevel}=1) {1}{U}:name(Level 2) counter(0/0,1,Level) asSorcery 
-auto=@each my blockers restriction{compare(hascntlevel)~equalto~2}:target(creature[attacking&power<=3]) unblockable ueot
+auto=@each my blockers restriction{compare(hascntlevel)~morethan~1}:target(creature[attacking&power<=3]) unblockable ueot
 auto=this(variable{hascntlevel}=2) {3}{U}:name(Level 3) counter(0/0,1,Level) asSorcery 
 auto=this(variable{hascntlevel}>=3):lord(creature|mybattlefield) transforms((,newability[@combatdamaged(player) from(this):may moveto(exile) and!( moveto(battlefield) )!]))
 text=(Gain the next level as a sorcery to add its ability.) -- Whenever a creature you control enters, surveil 1. -- {1}{U}: Level 2 -- Whenever you attack, target attacking creature with power 3 or less can't be blocked this turn. -- {3}{U}: Level 3 -- Whenever a creature you control deals combat damage to a player, you may exile it, then return it to the battlefield under its owner's control.
@@ -64106,9 +64106,10 @@ toughness=3
 [/card]
 [card]
 name=Mabel's Mettle
-target=creature
-auto=2/2
-auto=becomes(MabelsMettle) ueot && ability$!may target(creature[-MabelsMettle]) 1/1 ueot!$ controller
+target=<upto:2>creature
+auto=1/1
+auto=becomes(MabelsMettle) ueot 
+auto=target(creature[MabelsMettle]) 1/1 ueot
 text=Target creature gets +2/+2 until end of turn. Up to one other target creature gets +1/+1 until end of turn.
 mana={1}{W}
 type=Instant
@@ -104553,7 +104554,8 @@ toughness=3
 [/card]
 [card]
 name=Sunshower Druid
-auto=counter(1/1) target(creature) && life:1
+auto=counter(1/1) target(creature)
+auto=life:1
 text=When Sunshower Druid enters, put a +1/+1 counter on target creature and you gain 1 life.
 mana={G}
 type=Creature
@@ -122548,8 +122550,8 @@ toughness=5
 [card]
 name=Ygra, Eater of All
 auto=@targeted(this) from(*|opponentzones):choice name(This spell costs a sacrifice) name(This spell costs a sacrifice) target(*|opponentzones) transforms((,newability[choice name(Counter spell) target(*|mystack) fizzle],newability[if type(Food|myBattlefield)~morethan~0 then choice name(Sacrifice a permanent) name(Sacrifice a permanent) notatarget(Food|mybattlefield) sacrifice])) oneshot
-auto=lord(other creatures) transforms((Food artifact,newability[{2}{T}{S}:life:3]))
-auto=@movedto(Food|graveyard) from(battlefield):counter(1/1,2)
+auto=lord(other creature) transforms((Food artifact,newability[{2}{T}{S}:life:3]))
+auto=@movedto(graveyard) from(Food|battlefield):counter(1/1,2)
 text=Ward-Sacrifice a Food. -- Other creatures are Food artifacts in addition to their other types and have "{2}, {T}, Sacrifice this permanent: You gain 3 life." -- Whenever a Food is put into a graveyard from the battlefield, put two +1/+1 counters on Ygra, Eater of All.
 mana={3}{B}{G}
 type=Legendary Creature
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 5d3b21ac9..04d2b3f71 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -64884,7 +64884,7 @@ toughness=1
 name=Krovikan Whispers
 alias=1194
 target=creature
-auto=cumulativeupcostmulti[{U}{B}] sacrifice all(this)
+auto=cumulativeupcostmulti[{UB}] sacrifice all(this)
 auto=_DIES_thisforeach(counter{0/0.1.Age}) life:-2 controller
 text=Enchant creature -- Cumulative upkeep {U} or {B} (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.) -- You control enchanted creature. -- When Krovikan Whispers is put into a graveyard from the battlefield, you lose 2 life for each age counter on it.
 mana={3}{U}