diff --git a/projects/mtg/bin/Res/sets/primitives/_macros.txt b/projects/mtg/bin/Res/sets/primitives/_macros.txt
index 0991fdd2a..ee88d51e9 100644
--- a/projects/mtg/bin/Res/sets/primitives/_macros.txt
+++ b/projects/mtg/bin/Res/sets/primitives/_macros.txt
@@ -192,6 +192,12 @@
 # Discard a card. If you do, draw a card
 #AUTO_DEFINE _DISCARD&DRAW_ reject notatarget(*|myhand) and!(draw:1 controller)!
 
+# Target creature deals damage equal to its power to target creature you don't control.
+#AUTO_DEFINE _PUNCH_ transforms((,newability[dynamicability<!powerstrike!> target(creature|opponentbattlefield)])) oneshot
+
+# Must be blocked this turn if able
+#AUTO_DEFINE _MUST_BE_BLOCKD_ newability[@combat(attacking) source(this):ability$! notatarget(creature|myBattlefield) transforms((,newability[mustblock])) ueot!$ opponent]
+
 # Angel Token
 #AUTO_DEFINE _ANGELTOKEN_ create(Angel:Creature Angel:4/4:white:flying)
 
diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index ac53007fb..bb9a6ad5a 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -8546,8 +8546,8 @@ type=Instant
 [card]
 name=Bloodline Necromancer
 abilities=lifelink
-auto=name(return Vampire) may target(vampire[creature]|mygraveyard) moveTo(mybattlefield)
-auto=name(return Wizard) may target(wizard[creature]|mygraveyard) moveTo(mybattlefield)
+auto=may name(return Vampire) target(vampire[creature]|mygraveyard) moveTo(mybattlefield)
+auto=may name(return Wizard) target(wizard[creature]|mygraveyard) moveTo(mybattlefield)
 text=Lifelink -- When Bloodline Necromancer enters the battlefield, you may return target Vampire or Wizard creature card from your graveyard to the battlefield.
 mana={4}{B}
 type=Creature
@@ -15807,7 +15807,8 @@ toughness=2
 [card]
 name=Compelled Duel
 target=creature
-auto=transforms((,newability[3/3],newability[_ATTACKING_all(creature|opponentbattlefield) mustblock ueot])) ueot
+auto=3/3
+auto=transforms((,_MUST_BE_BLOCKD_)) ueot
 text=Target creature gets +3/+3 until end of turn and must be blocked this turn if able.
 mana={1}{G}
 type=Sorcery
@@ -19438,7 +19439,8 @@ type=Instant
 name=Deadly Allure
 target=creature
 flashback={G}
-auto=transforms((,newability[deathtouch ueot],newability[@combat(attacking,blocking) source(this): all(<anyamount>creature|opponentbattlefield) mustblock ueot])) ueot
+auto=deathtouch
+auto=transforms((,_MUST_BE_BLOCKD_)) ueot
 text=Target creature gains deathtouch until end of turn and must be blocked this turn if able. -- Flashback {G} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
 mana={B}
 type=Sorcery
@@ -24713,7 +24715,7 @@ subtype=Lesson
 [card]
 name=Elemental Uprising
 target=land|mybattlefield
-auto=transforms((Creature Elemental,setpower=4,settoughness=4,newability[haste],newability[_ATTACKING_all(creature|opponentbattlefield) transforms((,newability[mustblock])) ueot])) ueot
+auto=transforms((Creature Elemental,setpower=4,settoughness=4,newability[haste],_MUST_BE_BLOCKD_)) ueot
 text=Target land you control becomes a 4/4 Elemental creature with haste until end of turn. it's still a land. It must be blocked this turn if able.
 mana={1}{G}
 type=Instant
@@ -25284,7 +25286,7 @@ type=Sorcery
 [card]
 name=Emergent Growth
 target=creature
-auto=transforms((,newability[5/5],newability[_ATTACKING_all(creature|opponentbattlefield) transforms((,newability[mustblock])) ueot])) ueot
+auto=transforms((,newability[5/5],_MUST_BE_BLOCKD_)) ueot
 text=Target creature gets +5/+5 until end of turn and must be blocked this turn if able.
 mana={3}{G}
 type=Sorcery
@@ -25706,7 +25708,7 @@ name=Enlarge
 target=creature
 auto=trample ueot
 auto=7/7 ueot
-auto=transforms((,newability[_ATTACKING_ all(creature|opponentbattlefield) mustblock ueot])) ueot
+auto=transforms((,_MUST_BE_BLOCKD_)) ueot
 text=Target creature gets +7/+7 and gains trample until end of turn. It must be blocked this turn if able. (If a creature with trample would assign enough damage to its blockers to destroy them, you may have it assign the rest of its damage to defending player or planeswalker.)
 mana={3}{G}{G}
 type=Sorcery
@@ -26244,7 +26246,7 @@ toughness=5
 [/card]
 [card]
 name=Etchings of the Chosen
-auto=chooseatype transforms((,newability[lord(creature[chosentype]|mybattlefield) 1/1],newability[{1}{S(creature[chosentype]|mybattlefield)}:name(Creature gains indestructible) target(creature) indestructible ueot])) chooseend
+auto=chooseatype transforms((,newability[lord(creature[chosentype]|mybattlefield) 1/1],newability[{1}{S(creature[chosentype]|mybattlefield)}:name(Creature gains indestructible) target(creature|myBattlefield) indestructible ueot])) chooseend
 text=As Etchings of the Chosen enters the battlefield, choose a creature type. -- Creatures you control of the chosen type get +1/+1. -- {1}, Sacrifice a creature of the chosen type: Target creature you control gains indestructible until end of turn.
 mana={1}{W}{B}
 type=Enchantment
@@ -26751,12 +26753,11 @@ toughness=3
 [/card]
 [card]
 name=Exotic Orchard
-auto=this(variable{olandg}>0) {t}:out{g}
-auto=this(variable{olandu}>0) {t}:out{u}
-auto=this(variable{olandr}>0) {t}:out{r}
-auto=this(variable{olandb}>0) {t}:out{b}
 auto=this(variable{olandw}>0) {t}:out{w}
-auto=this(variable{olandc}>0) {t}:out{1}
+auto=this(variable{olandu}>0) {t}:out{u}
+auto=this(variable{olandb}>0) {t}:out{b}
+auto=this(variable{olandr}>0) {t}:out{r}
+auto=this(variable{olandg}>0) {t}:out{g}
 text={T}: Add one mana of any color that a land an opponent controls could produce.
 type=Land
 [/card]
@@ -28686,7 +28687,7 @@ subtype=Background
 [card]
 name=Fibrous Entangler
 abilities=vigilance
-auto=_ATTACKING_all(creature|opponentbattlefield) mustblock ueot
+auto=transforms((,_MUST_BE_BLOCKD_))
 text=Vigilance -- Fibrous Entangler must be blocked if able. -- Fibrous Entangler can block an additional creature each combat.
 mana={2}{G}{G}
 type=Creature
@@ -31489,7 +31490,7 @@ toughness=1
 [/card]
 [card]
 name=Gaea's Protector
-auto=_ATTACKING_ all(creature|opponentbattlefield) mustblock ueot
+auto=transforms((,_MUST_BE_BLOCKD_))
 text=Gaea's Protector must be blocked if able.
 mana={3}{G}
 type=Creature
@@ -34244,7 +34245,7 @@ type=Enchantment
 [card]
 name=Goblin Fire Fiend
 abilities=haste
-auto=_ATTACKING_all(creature|opponentBattlefield) mustblock ueot
+auto=transforms((,_MUST_BE_BLOCKD_))
 auto={R}:1/0 ueot
 text=Haste -- Goblin Fire Fiend must be blocked if able. -- {R}: Goblin Fire Fiend gets +1/+0 until end of turn.
 mana={3}{R}
@@ -34746,7 +34747,7 @@ toughness=3
 [/card]
 [card]
 name=Goldenhide Ox
-auto=name(Creature must be blocked) target(creature) transforms((,newability[_ATTACKING_all(creature|opponentbattlefield) transforms((,newability[mustblock])) ueot])) ueot
+auto=name(Creature must be blocked) target(creature) transforms((,_MUST_BE_BLOCKD_)) ueot
 auto=@movedto(enchantment|myBattlefield):name(Creature must be blocked) target(creature) transforms((,newability[_ATTACKING_all(creature|opponentbattlefield) transforms((,newability[mustblock])) ueot])) ueot
 text=Constellation - Whenever Goldenhide Ox or another enchantment enters the battlefield under your control, target creature must be blocked this turn if able.
 mana={5}{G}
@@ -35051,7 +35052,7 @@ name=Gorm the Great
 abilities=vigilance,menace,partner
 partner=Virtus the Veiled
 auto=_PARTNER_
-auto=_ATTACKING_all(creature|opponentbattlefield) mustblock ueot
+auto=transforms((,_MUST_BE_BLOCKD_))
 text=Partner with Virtus the Veiled (When this creature enters the battlefield, target player may put Virtus into their hand from their library, then shuffle.) -- Vigilance -- Gorm the Great must be blocked if able, and Gorm must be blocked by two or more creatures if able.
 mana={3}{G}
 type=Legendary Creature
@@ -36892,7 +36893,7 @@ toughness=3
 [card]
 name=Halana, Kessig Ranger
 abilities=reach,partner
-auto=@movedTo(other creature|mybattlefield):pay({2}) name(Pay 2) all(trigger[to]) transforms((,newability[dynamicability<!powerstrike!> target(creature)])) oneshot
+auto=@movedTo(other creature|mybattlefield):all(trigger) transforms((,newability[pay[[{2}]] dynamicability<!powerstrike!> target(creature)])) oneshot
 text=Reach -- Whenever another creature enters the battlefield under your control, you may pay {2}. When you do, that creature deals damage equal to its power to target creature. -- Partner (You can have two commanders if both have partner.)
 mana={3}{G}
 type=Legendary Creature
@@ -37280,7 +37281,7 @@ toughness=4
 [/card]
 [card]
 name=Hapatra's Mark
-target=creature
+target=creature|myBattlefield
 auto=opponentshroud
 auto=counter(-1/-1,-20)
 text=Target creature you control gains hexproof until end of turn. Remove all -1/-1 counters from it. (A creature with hexproof can't be the target of spells or abilities your opponents control.)
@@ -38941,7 +38942,7 @@ toughness=1
 name=Hinterland Scourge
 auto=@each upkeep restriction{lastturn(*|mystack)~morethan~1,lastturn(*|opponentstack)~lessthan~2}:name(Transform Werewolf) flip(Hinterland Hermit)
 auto=@each upkeep restriction{lastturn(*|opponentstack)~morethan~1}:name(Transform Werewolf) flip(Hinterland Hermit)
-auto=_ATTACKING_all(creature|opponentbattlefield) transforms((,newability[mustblock])) ueot
+auto=transforms((,_MUST_BE_BLOCKD_)) forever
 text=Hinterland Scourge must be blocked if able. -- At the beginning of each upkeep, if a player cast two or more spells last turn, transform Hinterland Scourge. // Hinterland Hermit
 type=Creature
 subtype=Werewolf
@@ -41583,7 +41584,7 @@ type=Instant
 [card]
 name=Inescapable Brute
 abilities=wither
-auto=_ATTACKING_all(creature|opponentBattlefield) mustblock ueot
+auto=transforms((,_MUST_BE_BLOCKD_)) forever
 text=Wither (This deals damage to creatures in the form of -1/-1 counters.) -- Inescapable Brute must be blocked if able.
 mana={5}{R}
 type=Creature
@@ -42902,7 +42903,7 @@ toughness=2
 [card]
 name=Irresistible Prey
 target=creature
-auto=transforms((,newability[_ATTACKING_all(creature|opponentbattlefield) mustblock ueot])) ueot
+auto=transforms((,_MUST_BE_BLOCKD_)) ueot
 auto=draw:1 controller
 text=Target creature must be blocked this turn if able. -- Draw a card.
 mana={G}
@@ -43812,7 +43813,7 @@ toughness=2
 [card]
 name=Joraga Invocation
 auto=all(creature|mybattlefield) 3/3 ueot
-auto=all(creature|opponentbattlefield) mustblock ueot
+auto=transforms((,_MUST_BE_BLOCKD_))
 text=Each creature you control gets +3/+3 until end of turn and must be blocked this turn if able.
 mana={4}{G}{G}
 type=Sorcery
@@ -45286,11 +45287,12 @@ type=Artifact
 [/card]
 [card]
 name=Khalni Ambush
+target=creature|mybattlefield
 restriction=compare(isflipped)~equalto~0
 anyzone={0}:doubleside(Khalni Territory)
 autohand={0}:restriction{can play land,compare(isflipped)~equalto~1} name(Khalni Territory) name(Khalni Territory) flip(Khalni Territory) forcetype(land)
 restriction=type(creature|opponentbattlefield)~morethan~0,type(creature|myBattlefield)~morethan~0
-auto=name(fights target creature you don't control) name(fights target creature you don't control) target(creature|mybattlefield) transforms((,newability[target(creature|opponentbattlefield) dynamicability<!powerstrike eachother!>])) ueot
+auto=name(fights target creature you don't control) name(fights target creature you don't control) transforms((,newability[target(creature|opponentbattlefield) dynamicability<!powerstrike eachother!>])) ueot
 text=Target creature you control fights target creature you don't control. (Each deals damage equal to its power to the other.) // Khalni Territory
 mana={2}{G}
 type=Instant
@@ -45567,7 +45569,7 @@ toughness=3
 name=King Harald's Revenge
 target=creature
 auto=foreach(creature|myBattlefield) 1/1
-auto=transforms((,newability[trample],newability[_ATTACKING_all(creature|opponentbattlefield) mustblock ueot])) ueot
+auto=transforms((,newability[trample],_MUST_BE_BLOCKD_)) ueot
 text=Until end of tun, target creature gets +1/+1 for each creature you control and gains trample. It must be blocked this turn if able.
 mana={2}{G}
 type=Sorcery
@@ -48807,7 +48809,7 @@ toughness=6
 [/card]
 [card]
 name=Loathsome Catoblepas
-auto={2}{G}:transforms((,newability[_ATTACKING_all(creature|opponentbattlefield) mustblock ueot])) ueot
+auto={2}{G}:transforms((,_MUST_BE_BLOCKD_)) ueot
 auto=_DIES_target(creature|opponentbattlefield) -3/-3 ueot
 text={2}{G}: Loathsome Catoblepas must be blocked this turn if able. -- When Loathsome Catoblepas dies, target creature an opponent controls gets -3/-3 until end of turn.
 mana={5}{B}
@@ -51271,7 +51273,8 @@ toughness=4
 [card]
 name=Massive Might
 target=creature
-auto=transforms((,newability[2/2],newability[trample])) ueot
+auto=2/2
+auto=trample
 text=Target creature gets +2/+2 and gains trample until end of turn.
 mana={G}
 type=Instant
@@ -54941,7 +54944,7 @@ type=Instant
 [/card]
 [card]
 name=Nature's Way
-target=creature
+target=creature|myBattlefield
 auto=vigilance ueot
 auto=trample ueot
 auto=transforms((,newability[dynamicability<!powerstrike!> target(creature|opponentBattlefield)])) forever
@@ -55687,7 +55690,7 @@ type=Instant
 name=Neyith of the Dire Hunt
 auto=@combat(blocked) source(creature|mybattlefield) turnlimited:name(Draw a card) draw:1 controller
 auto=@damaged(creature) from(creature[-attacking;-blocking]|mybattlefield) turnlimited:may name(Draw a card) draw:1 controller
-auto=@each my combatbegins:name(Pay and double creature's power) pay({2}{RG}) name(Pay and double creature's power) target(creature) transforms((,newability[p/0],,newability[_ATTACKING_ability$! notatarget(creature|myBattlefield) transforms((,newability[mustblock])) ueot!$ opponent])) ueot
+auto=@each my combatbegins:name(Pay and double creature's power) pay({2}{RG}) name(Pay and double creature's power) target(creature) transforms((,newability[p/0],_MUST_BE_BLOCKD_)) ueot
 text=Whenever one or more creatures you control fight or become blocked, draw a card. -- At the beginning of combat on your turn, you may pay {2}{R} or {G}. If you do, double target creature's power until end of turn. That creature must be blocked this combat if able. ( {R} or {G} can be paid with either {R} or {G}.)
 mana={2}{G}{G}
 type=Legendary Creature
@@ -60120,9 +60123,9 @@ type=Instant
 [/card]
 [card]
 name=Phalanx Tactics
-target=creature
-auto=target(creature|myBattlefield) 2/1 ueot
-auto=all(other creature|mybattlefield) 1/1 ueot
+target=creature|myBattlefield
+auto=1/0
+auto=all(creature|mybattlefield) 1/1 ueot
 text=Target creature you control gets +2/+1 until end of turn. Each other creature you control gets +1/+1 until end of turn.
 mana={1}{W}
 type=Instant
@@ -61150,7 +61153,7 @@ toughness=2
 [/card]
 [card]
 name=Platoon Dispenser
-auto=@each my endofturn:if type(creature|mybattlefield)~morethan~2 then draw:1
+auto=@each my endofturn:if type(other creature|mybattlefield)~morethan~1 then draw:1
 auto={3}{W}:create(soldier:artifact creature soldier:1/1:colorless)
 autograveyard={2}{W}{W}:_UNEARTH_
 text=At the beginning of your end step, if you control two or more other creatures, draw a card. -- {3}{W}: Create a 1/1 colorless Soldier artifact creature token. -- Unearth {2}{W}{W}
@@ -61329,7 +61332,7 @@ abilities=hasotherkicker
 other={W}{S(land|myBattlefield)} name(Pay kicker)
 auto=if paid(alternative) then thisforeach(variable{6}) ability$!name(Prevent 1 damage) name(Prevent 1 damage) target(player,creature) prevent:1!$ controller
 auto=ifnot paid(alternative) then thisforeach(variable{3}) ability$!name(Prevent 1 damage) name(Prevent 1 damage) target(player,creature) prevent:1!$ controller
-text=Kicker'sacrifice a land. (You may sacrifice a land in addition to any other costs as you cast this spell.) -- Prevent the next 3 damage that would be dealt this turn to any number of target creatures and/or players, divided as you choose. If Pollen Remedy was kicked, prevent the next 6 damage this way instead.
+text=Kicker - Sacrifice a land. (You may sacrifice a land in addition to any other costs as you cast this spell.) -- Prevent the next 3 damage that would be dealt this turn to any number of targets, divided as you choose. If this spell was kicked, prevent the next 6 damage this way instead.
 mana={W}
 type=Instant
 [/card]
@@ -61910,8 +61913,8 @@ type=Sorcery
 [card]
 name=Predatory Impetus
 target=creature
-auto=teach(creature) transforms((,newability[counter(0/0.1.Goaded)],newability[this(counter{0/0.1.Goaded}>0) mustattack],newability[_ATTACKING_all(creature|opponentbattlefield) transforms((,newability[mustblock])) ueot]))
 auto=3/3
+auto=teach(creature) transforms((,newability[counter(0/0.1.Goaded)],newability[this(counter{0/0.1.Goaded}>0) mustattack],_MUST_BE_BLOCKD_))
 text=Enchant creature -- Enchanted creature gets +3/+3, must be blocked if able, and is goaded. (It attacks each combat if able and attacks a player other than you if able.)
 mana={4}{G}
 type=Enchantment
@@ -64443,7 +64446,7 @@ type=Instant
 [card]
 name=Ram Through
 target=creature|mybattlefield
-auto=transforms((,newability[dynamicability<!powerstrike!> target(creature|opponentbattlefield)]))
+auto=transforms((,newability[dynamicability<!powerstrike!> target(creature|opponentbattlefield)])) oneshot
 text=Target creature you control deals damage equal to its power to target creature you don't control. If the creature you control has trample, excess damage is dealt to that creature's controller instead.
 mana={1}{G}
 type=Instant
@@ -67867,6 +67870,7 @@ type=Instant
 [card]
 name=Riveteers Decoy
 other={3}{G}:name(Blitz)
+auto=transforms((,_MUST_BE_BLOCKD_)) forever
 auto=if paid(alternative) then moveto(mybattlefield) and!( transforms((,newability[haste],newability[_DIES_draw:1],newability[treason])) forever )! asSorcery
 text=Riveteers Decoy must be blocked if able. -- Blitz {3}{G} (If you cast this spell for its blitz cost, it gains haste and "When this creature dies, draw a card." Sacrifice it at the beginning of the next end step.)
 mana={1}{G}
@@ -70354,7 +70358,7 @@ toughness=2
 [/card]
 [card]
 name=Satyr Piper
-auto={3}{G}:target(creature) transforms((,newability[_ATTACKING_all(creature|opponentbattlefield) mustblock ueot])) ueot
+auto={3}{G}:target(creature) transforms((,_MUST_BE_BLOCKD_)) ueot
 text={3}{G}: Target creature must be blocked this turn if able.
 mana={2}{G}
 type=Creature
@@ -74697,26 +74701,26 @@ type=Artifact
 [card]
 name=Simic Manipulator
 auto=evolve
-auto={T}:name(remove 1 Counter) this(counter{1/1}>=1) counter(1/1,-1) target(creature[power<=1]|opponentbattlefield) moveto(mybattlefield)
-auto={T}:name(remove 2 Counter) this(counter{1/1}>=2) counter(1/1,-2) target(creature[power<=2]|opponentbattlefield) moveto(mybattlefield)
-auto={T}:name(remove 3 Counter) this(counter{1/1}>=3) counter(1/1,-3) target(creature[power<=3]|opponentbattlefield) moveto(mybattlefield)
-auto={T}:name(remove 4 Counter) this(counter{1/1}>=4) counter(1/1,-4) target(creature[power<=4]|opponentbattlefield) moveto(mybattlefield)
-auto={T}:name(remove 5 Counter) this(counter{1/1}>=5) counter(1/1,-5) target(creature[power<=5]|opponentbattlefield) moveto(mybattlefield)
-auto={T}:name(remove 6 Counter) this(counter{1/1}>=6) counter(1/1,-6) target(creature[power<=6]|opponentbattlefield) moveto(mybattlefield)
-auto={T}:name(remove 7 Counter) this(counter{1/1}>=7) counter(1/1,-7) target(creature[power<=7]|opponentbattlefield) moveto(mybattlefield)
-auto={T}:name(remove 8 Counter) this(counter{1/1}>=8) counter(1/1,-8) target(creature[power<=8]|opponentbattlefield) moveto(mybattlefield)
-auto={T}:name(remove 9 Counter) this(counter{1/1}>=9) counter(1/1,-9) target(creature[power<=9]|opponentbattlefield) moveto(mybattlefield)
-auto={T}:name(remove 10 Counter) this(counter{1/1}>=10) counter(1/1,-10) target(creature[power<=10]|opponentbattlefield) moveto(mybattlefield)
-auto={T}:name(remove 11 Counter) this(counter{1/1}>=11) counter(1/1,-11) target(creature[power<=11]|opponentbattlefield) moveto(mybattlefield)
-auto={T}:name(remove 12 Counter) this(counter{1/1}>=12) counter(1/1,-12) target(creature[power<=12]|opponentbattlefield) moveto(mybattlefield)
-auto={T}:name(remove 13 Counter) this(counter{1/1}>=13) counter(1/1,-13) target(creature[power<=13]|opponentbattlefield) moveto(mybattlefield)
-auto={T}:name(remove 14 Counter) this(counter{1/1}>=14) counter(1/1,-14) target(creature[power<=14]|opponentbattlefield) moveto(mybattlefield)
-auto={T}:name(remove 15 Counter) this(counter{1/1}>=15) counter(1/1,-15) target(creature[power<=15]|opponentbattlefield) moveto(mybattlefield)
-auto={T}:name(remove 16 Counter) this(counter{1/1}>=16) counter(1/1,-16) target(creature[power<=16]|opponentbattlefield) moveto(mybattlefield)
-auto={T}:name(remove 17 Counter) this(counter{1/1}>=17) counter(1/1,-17) target(creature[power<=17]|opponentbattlefield) moveto(mybattlefield)
-auto={T}:name(remove 18 Counter) this(counter{1/1}>=18) counter(1/1,-18) target(creature[power<=18]|opponentbattlefield) moveto(mybattlefield)
-auto={T}:name(remove 19 Counter) this(counter{1/1}>=19) counter(1/1,-19) target(creature[power<=19]|opponentbattlefield) moveto(mybattlefield)
-auto={T}:name(remove 20 Counter) this(counter{1/1}>=20) counter(1/1,-20) target(creature[power<=20]|opponentbattlefield) moveto(mybattlefield)
+auto={T}{C(1/1,-1)}:name(remove 1 Counter) target(creature[power<=1]|opponentbattlefield) moveto(mybattlefield)
+auto={T}{C(1/1,-2)}:name(remove 2 Counters) target(creature[power<=2]|opponentbattlefield) moveto(mybattlefield)
+auto={T}{C(1/1,-3)}:name(remove 3 Counters) target(creature[power<=3]|opponentbattlefield) moveto(mybattlefield)
+auto={T}{C(1/1,-4)}:name(remove 4 Counters) target(creature[power<=4]|opponentbattlefield) moveto(mybattlefield)
+auto={T}{C(1/1,-5)}:name(remove 5 Counters) target(creature[power<=5]|opponentbattlefield) moveto(mybattlefield)
+auto={T}{C(1/1,-6)}:name(remove 6 Counters) target(creature[power<=6]|opponentbattlefield) moveto(mybattlefield)
+auto={T}{C(1/1,-7)}:name(remove 7 Counters) target(creature[power<=7]|opponentbattlefield) moveto(mybattlefield)
+auto={T}{C(1/1,-8)}:name(remove 8 Counters) target(creature[power<=8]|opponentbattlefield) moveto(mybattlefield)
+auto={T}{C(1/1,-9)}:name(remove 9 Counters) target(creature[power<=9]|opponentbattlefield) moveto(mybattlefield)
+auto={T}{C(1/1,-10)}:name(remove 10 Counters) target(creature[power<=10]|opponentbattlefield) moveto(mybattlefield)
+auto={T}{C(1/1,-11)}:name(remove 11 Counters) target(creature[power<=11]|opponentbattlefield) moveto(mybattlefield)
+auto={T}{C(1/1,-12)}:name(remove 12 Counters) target(creature[power<=12]|opponentbattlefield) moveto(mybattlefield)
+auto={T}{C(1/1,-13)}:name(remove 13 Counters) target(creature[power<=13]|opponentbattlefield) moveto(mybattlefield)
+auto={T}{C(1/1,-14)}:name(remove 14 Counters) target(creature[power<=14]|opponentbattlefield) moveto(mybattlefield)
+auto={T}{C(1/1,-15)}:name(remove 15 Counters) target(creature[power<=15]|opponentbattlefield) moveto(mybattlefield)
+auto={T}{C(1/1,-16)}:name(remove 16 Counters) target(creature[power<=16]|opponentbattlefield) moveto(mybattlefield)
+auto={T}{C(1/1,-17)}:name(remove 17 Counters) target(creature[power<=17]|opponentbattlefield) moveto(mybattlefield)
+auto={T}{C(1/1,-18)}:name(remove 18 Counters) target(creature[power<=18]|opponentbattlefield) moveto(mybattlefield)
+auto={T}{C(1/1,-19)}:name(remove 19 Counters) target(creature[power<=19]|opponentbattlefield) moveto(mybattlefield)
+auto={T}{C(1/1,-20)}:name(remove 20 Counters) target(creature[power<=20]|opponentbattlefield) moveto(mybattlefield)
 text=Evolve (Whenever a creature enters the battlefield under your control, if that creature has greater power or toughness than this creature, put a +1/+1 counter on this creature.) -- {T}, Remove one or more +1/+1 counters from Simic Manipulator: Gain control of target creature with power less than or equal to the number of +1/+1 counters removed this way.
 mana={1}{U}{U}
 type=Creature
@@ -75921,7 +75925,7 @@ subtype=Clue
 name=Slayer's Cleaver
 auto={4}:equip
 auto=teach(creature) 3/1
-auto=@combat(attacking) source(mytgt):all(*[eldrazi]|opponentbattlefield) transforms((,newability[mustblock])) ueot
+auto=@combat(attacking) source(mytgt):ability$! notatarget(Eldrazi|myBattlefield) transforms((,newability[mustblock])) ueot!$ opponent
 text=Equipped creature gets +3/+1 and must be blocked by an Eldrazi if able. -- Equip {4}
 mana={3}
 type=Artifact
@@ -82941,8 +82945,7 @@ toughness=5
 [/card]
 [card]
 name=Tawnos, the Toymaker
-auto=@movedTo(Beast[creature]|mystack):may name(Copy creature) all(trigger[to]) name(Copy creature) clone and!( transforms((artifact)) forever )!
-auto=@movedTo(Bird[creature]|mystack):may name(Copy creature) all(trigger[to]) name(Copy creature) clone and!( transforms((artifact)) forever )!
+auto=@movedTo(Beast,Bird|mystack):may name(Copy creature) all(trigger[to]) name(Copy creature) clone and!( transforms((artifact)) forever )!
 text=Whenever you cast a Beast or Bird creature spell, you may copy it, except the copy is an artifact in addition to its other types. (The copy becomes a token.)
 mana={3}{G}{U}
 type=Legendary Creature
@@ -89318,7 +89321,7 @@ toughness=4
 [card]
 name=Urza's Tome
 auto={3}{T}:_LOOT_
-auto={3}{T} restriction{type(*[artifact;legendary;saga]|mygraveyard)~morethan~0}:draw:1 && exile notatarget(*[artifact;legendary;saga]|mygraveyard)
+auto={3}{T} restriction{type(*[artifact;legendary;saga]|mygraveyard)~morethan~0}:name(exile a historic card) draw:1 && transforms((,newability[notatarget(*[artifact;legendary;saga]|mygraveyard) moveto(exile)])) oneShot
 text={3}, {T}: Draw a card. Then discard a card unless you exile a historic card from your graveyard. (Artifacts, legendaries, and Sagas are historic.)
 mana={2}
 type=Artifact
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 04e90ef1e..b7ea77d83 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -4176,7 +4176,7 @@ type=Instant
 [/card]
 [card]
 name=Animate Wall
-target=wall
+target=creature[wall]
 auto=canattack
 text=Enchant Wall -- Enchanted Wall can attack as though it didn't have defender.
 mana={W}
@@ -12386,7 +12386,7 @@ type=Land
 [/card]
 [card]
 name=Bloodfire Colossus
-auto={R}{S}:damage:6 all(creature,player)
+auto={R}{S}:damage:6 all(creature) && damage:6 all(player)
 text={R}, Sacrifice Bloodfire Colossus: Bloodfire Colossus deals 6 damage to each creature and each player.
 mana={6}{R}{R}
 type=Creature
@@ -17828,7 +17828,7 @@ toughness=2
 [card]
 name=Cave-In
 other={E(other *[red]|myhand)} name(Exile Red Card from Hand)
-auto=damage:2 all(creature,player)
+auto=damage:2 all(creature) && damage:2 all(player)
 text=You may exile a red card from your hand rather than pay Cave-In's mana cost. -- Cave-In deals 2 damage to each creature and each player.
 mana={3}{R}{R}
 type=Sorcery
@@ -20291,7 +20291,7 @@ type=Sorcery
 [/card]
 [card]
 name=Clear Shot
-target=creature
+target=creature|myBattlefield
 auto=1/1 ueot
 auto=transforms((,newability[dynamicability<!powerstrike!> target(creature|opponentBattlefield)])) forever
 text=Target creature you control gets +1/+1 until end of turn. It deals damage equal to its power to target creature you don't control.
@@ -24474,7 +24474,7 @@ type=Land
 [/card]
 [card]
 name=Crypt Rats
-auto={X:black}:damage:X all(creature,player)
+auto={X:black}:damage:X all(creature) && damage:X all(player)
 text={X}: Crypt Rats deals X damage to each creature and each player. Spend only black mana this way.
 mana={2}{B}
 type=Creature
@@ -29027,7 +29027,7 @@ toughness=6
 name=Devastate
 target=land
 auto=destroy
-auto=damage:1 all(creature,player)
+auto=damage:1 all(creature) && damage:1 all(player)
 text=Destroy target land. Devastate deals 1 damage to each creature and each player.
 mana={3}{R}{R}
 type=Sorcery
@@ -32709,7 +32709,7 @@ toughness=1
 [/card]
 [card]
 name=Dry Spell
-auto=damage:1 all(creature,player)
+auto=damage:1 all(creature) && damage:1 all(player)
 text=Dry Spell deals 1 damage to each creature and each player.
 mana={1}{B}
 type=Sorcery
@@ -37572,7 +37572,7 @@ toughness=0
 [/card]
 [card]
 name=Evincar's Justice
-auto=damage:2 all(creature,player)
+auto=damage:2 all(creature) && damage:2 all(player)
 buyback={2}{B}{B}{3}
 text=Buyback {3} (You may pay an additional {3} as you cast this spell. If you do, put this card into your hand as it resolves.) -- Evincar's Justice deals 2 damage to each creature and each player.
 mana={2}{B}{B}
@@ -38886,7 +38886,7 @@ type=Instant
 [/card]
 [card]
 name=Famine
-auto=damage:3 all(creature,player)
+auto=damage:3 all(creature) && damage:3 all(player)
 text=Famine deals 3 damage to each creature and each player.
 mana={3}{B}{B}
 type=Sorcery
@@ -40044,8 +40044,8 @@ toughness=3
 [/card]
 [card]
 name=Festering Evil
-auto=@each my upkeep:damage:1 all(creature,player)
-auto={B}{B}{S}:damage:3 all(creature,player)
+auto=@each my upkeep:damage:1 all(creature) && damage:1 all(player)
+auto={B}{B}{S}:damage:3 all(creature) && damage:3 all(player)
 text=At the beginning of your upkeep, Festering Evil deals 1 damage to each creature and each player. -- {B}{B}, Sacrifice Festering Evil: Festering Evil deals 3 damage to each creature and each player.
 mana={3}{B}{B}
 type=Enchantment
@@ -40670,7 +40670,7 @@ toughness=1
 [/card]
 [card]
 name=Fire Tempest
-auto=damage:6 all(creature,player)
+auto=damage:6 all(creature) && damage:6 all(player)
 text=Fire Tempest deals 6 damage to each creature and each player.
 mana={5}{R}{R}
 type=Sorcery
@@ -44601,7 +44601,7 @@ toughness=4
 [/card]
 [card]
 name=Gangrenous Zombies
-auto={T}{S}:damage:1 all(creature,player) && aslongas(swamp[snow]|myBattlefield)damage:1 all(creature,player)
+auto={T}{S}:damage:1 all(creature) && damage:1 all(player) && aslongas(swamp[snow]|myBattlefield)damage:1 all(creature) && damage:2 all(player)
 text={T}, Sacrifice Gangrenous Zombies: Gangrenous Zombies deals 1 damage to each creature and each player. If you control a snow Swamp, Gangrenous Zombies deals 2 damage to each creature and each player instead.
 mana={1}{B}{B}
 type=Creature
@@ -46447,7 +46447,7 @@ subtype=Aura
 [/card]
 [card]
 name=Gigantomancer
-auto={1}:target(creature) transforms((,setpower=7,settoughness=7)) ueot
+auto={1}:target(creature|myBattlefield) transforms((,setpower=7,settoughness=7)) ueot
 text={1}: Target creature you control becomes 7/7 until end of turn.
 mana={7}{G}
 type=Creature
@@ -48217,8 +48217,8 @@ toughness=1
 [/card]
 [card]
 name=Goblin Sappers
-auto={R}{R}{T}:unblockable target(creature) && phaseaction[combatends once] destroy && all(this) phaseaction[combatends,sourceinplay] destroy
-auto={R}{R}{R}{R}{T}:unblockable target(creature) && phaseaction[combatends once] destroy
+auto={R}{R}{T}:unblockable target(creature|myBattlefield) && phaseaction[combatends once] destroy && all(this) phaseaction[combatends,sourceinplay] destroy
+auto={R}{R}{R}{R}{T}:unblockable target(creature|myBattlefield) && phaseaction[combatends once] destroy
 text={R}{R}, {T}: Target creature you control is unblockable this turn. Destroy it and Goblin Sappers at end of combat. -- {R}{R}{R}{R}, {T}: Target creature you control is unblockable this turn. Destroy it at end of combat.
 mana={1}{R}
 type=Creature
@@ -58020,8 +58020,8 @@ toughness=1
 [/card]
 [card]
 name=Infected Vermin
-auto={2}{B}:damage:1 all(creature,player)
-auto=aslongas(*|mygraveyard) {3}{B}:damage:3 all(creature,player) >6
+auto={2}{B}:damage:1 all(creature) && damage:1 all(player)
+auto=aslongas(*|mygraveyard) {3}{B}:damage:3 all(creature) && damage:3 all(player) >6
 text={2}{B}: Infected Vermin deals 1 damage to each creature and each player. -- Threshold - {3}{B}: Infected Vermin deals 3 damage to each creature and each player. Activate this ability only if seven or more cards are in your graveyard.
 mana={2}{B}
 type=Creature
@@ -60032,7 +60032,7 @@ toughness=1
 name=Jaya Ballard, Task Mage
 auto={R}{T}{D(*|myHand)}:destroy target(*[blue])
 auto={1}{R}{T}{D(*|myHand)}:damage:3 && cantregen target(creature,player)
-auto={5}{R}{R}{D(*|myHand)}:damage:6 all(creature,player)
+auto={5}{R}{R}{D(*|myHand)}:damage:6 all(creature) && damage:6 all(player)
 text={R}, {T}, Discard a card: Destroy target blue permanent. -- {1}{R}, {T}, Discard a card: Jaya Ballard, Task Mage deals 3 damage to target creature or player. A creature dealt damage this way can't be regenerated this turn. -- {5}{R}{R}, {T}, Discard a card: Jaya Ballard deals 6 damage to each creature and each player.
 mana={1}{R}{R}
 type=Legendary Creature
@@ -63393,7 +63393,7 @@ toughness=1
 [/card]
 [card]
 name=Kitsune Palliator
-auto={T}:prevent:1 all(creature,player)
+auto={T}:prevent:1 all(creature) && prevent:1 all(player)
 text={T}: Prevent the next 1 damage that would be dealt to each creature and each player this turn.
 mana={2}{W}
 type=Creature
@@ -64790,7 +64790,7 @@ toughness=1
 [card]
 name=Krovikan Elementalist
 auto={2}{R}:1/0 target(creature)
-auto={U}{U}:flying target(creature) && treason
+auto={U}{U}:flying target(creature|myBattlefield) && treason
 text={2}{R}: Target creature gets +1/+0 until end of turn. -- {U}{U}: Target creature you control gains flying until end of turn. Sacrifice it at the beginning of the next end step.
 mana={B}{B}
 type=Creature
@@ -65729,7 +65729,7 @@ type=Instant
 [/card]
 [card]
 name=Last Laugh
-auto=@movedto(other *|graveyard) from(battlefield):damage:1 all(creature,player)
+auto=@movedto(other *|graveyard) from(battlefield):damage:1 all(creature) && damage:1 all(player)
 auto=aslongas(creature|battlefield) all(this) sacrifice while <1
 text=Whenever a permanent other than Last Laugh is put into a graveyard from the battlefield, Last Laugh deals 1 damage to each creature and each player. -- When no creatures are on the battlefield, sacrifice Last Laugh.
 mana={2}{B}{B}
@@ -69681,7 +69681,7 @@ type=Instant
 [/card]
 [card]
 name=Magma Giant
-auto=damage:2 all(creature,player)
+auto=damage:2 all(creature) && damage:2 all(player)
 text=When Magma Giant enters the battlefield, it deals 2 damage to each creature and each player.
 mana={5}{R}{R}
 type=Creature
@@ -69709,7 +69709,7 @@ type=Artifact
 [card]
 name=Magma Phoenix
 abilities=flying
-auto=_DIES_damage:3 all(creature,player)
+auto=_DIES_damage:3 all(creature) && damage:3 all(player)
 autograveyard={3}{R}{R}:moveTo(myhand)
 text=Flying -- When Magma Phoenix dies, it deals 3 damage to each creature and each player. -- {3}{R}{R}: Return Magma Phoenix from your graveyard to your hand.
 mana={3}{R}{R}
@@ -80846,7 +80846,7 @@ toughness=4
 [card]
 name=Noxious Field
 target=land|myBattlefield
-auto=teach(land) {T}:damage:1 all(creature,player)
+auto=teach(land) {T}:damage:1 all(creature) && damage:1 all(player)
 text=Enchant land -- Enchanted land has "{T}: This land deals 1 damage to each creature and each player."
 mana={1}{B}{B}
 type=Enchantment
@@ -85548,7 +85548,7 @@ toughness=1
 [card]
 name=Pestilence Demon
 abilities=flying
-auto={B}:damage:1 all(creature,player)
+auto={B}:damage:1 all(creature) && damage:1 all(player)
 text=Flying -- {B}: Pestilence Demon deals 1 damage to each creature and each player.
 mana={5}{B}{B}{B}
 type=Creature
@@ -85569,7 +85569,7 @@ toughness=3
 [card]
 name=Pestilence
 auto=@each endofturn restriction{type(creature|battlefield)~lessthan~1}:sacrifice
-auto={B}:damage:1 all(creature,player)
+auto={B}:damage:1 all(creature) && damage:1 all(player)
 text=At the beginning of the end step, if no creatures are on the battlefield, sacrifice Pestilence. -- {B}: Pestilence deals 1 damage to each creature and each player.
 mana={2}{B}{B}
 type=Enchantment
@@ -87175,8 +87175,8 @@ toughness=5
 [/card]
 [card]
 name=Plague Spitter
-auto=@each my upkeep:damage:1 all(creature,player)
-auto=_DIES_damage:1 all(creature,player)
+auto=@each my upkeep:damage:1 all(creature) && damage:1 all(player)
+auto=_DIES_damage:1 all(creature) && damage:1 all(player)
 text=At the beginning of your upkeep, Plague Spitter deals 1 damage to each creature and each player. -- When Plague Spitter dies, Plague Spitter deals 1 damage to each creature and each player.
 mana={2}{B}
 type=Creature
@@ -89540,7 +89540,7 @@ type=Instant
 name=Psychotic Haze
 abilities=madness
 autoexile=restriction{discarded} pay({1}{B}) name(pay 1B to cast) activate name(pay 1B to cast) castcard(normal)?name(put in graveyard) moveto(ownergraveyard)
-auto=damage:1 all(creature,player)
+auto=damage:1 all(creature) && damage:1 all(player)
 text=Psychotic Haze deals 1 damage to each creature and each player. -- Madness {1}{B} (If you discard this card, you may cast it for its madness cost instead of putting it into your graveyard.)
 mana={2}{B}{B}
 type=Instant
@@ -90229,7 +90229,7 @@ type=Enchantment
 [/card]
 [card]
 name=Pyrohemia
-auto={R}:damage:1 all(creature,player)
+auto={R}:damage:1 all(creature) && damage:1 all(player)
 auto=@each endofturn restriction{type(creature|battlefield)~lessthan~1}:sacrifice
 text=At the beginning of the end step, if no creatures are on the battlefield, sacrifice Pyrohemia. -- {R}: Pyrohemia deals 1 damage to each creature and each player.
 mana={2}{R}{R}
@@ -91261,7 +91261,7 @@ type=Sorcery
 [/card]
 [card]
 name=Rain of Embers
-auto=damage:1 all(creature,player)
+auto=damage:1 all(creature) && damage:1 all(player)
 text=Rain of Embers deals 1 damage to each creature and each player.
 mana={1}{R}
 type=Sorcery
@@ -91900,7 +91900,7 @@ toughness=2
 [/card]
 [card]
 name=Ranger's Guile
-target=creature
+target=creature|myBattlefield
 auto=1/1
 auto=opponentshroud
 text=Target creature you control gets +1/+1 and gains hexproof until end of turn.
@@ -100654,7 +100654,7 @@ toughness=3
 [/card]
 [card]
 name=Screams of the Damned
-auto={1}{B}{E(*|mygraveyard)}:damage:1 all(creature,player)
+auto={1}{B}{E(*|mygraveyard)}:damage:1 all(creature) && damage:1 all(player)
 text={1}{B}, Exile a card from your graveyard: Screams of the Damned deals 1 damage to each creature and each player.
 mana={3}{B}{B}
 type=Enchantment
@@ -106621,7 +106621,7 @@ toughness=1
 [card]
 name=Skirk Fire Marshal
 abilities=protection from red
-auto={T(goblin|myBattlefield)}{T(goblin|myBattlefield)}{T(goblin|myBattlefield)}{T(goblin|myBattlefield)}{T(goblin|myBattlefield)}:damage:10 all(creature,player)
+auto={T(goblin|myBattlefield)}{T(goblin|myBattlefield)}{T(goblin|myBattlefield)}{T(goblin|myBattlefield)}{T(goblin|myBattlefield)}:damage:10 all(creature) && damage:10 all(player)
 text=Protection from red -- Tap five untapped Goblins you control: Skirk Fire Marshal deals 10 damage to each creature and each player.
 mana={3}{R}{R}
 type=Creature
@@ -110052,7 +110052,7 @@ type=Sorcery
 [/card]
 [card]
 name=Soulshriek
-target=creature
+target=creature|myBattlefield
 auto=foreach(creature|mygraveyard) 1/0
 auto=treason
 text=Target creature you control gets +X/+0 until end of turn, where X is the number of creature cards in your graveyard. Sacrifice that creature at the beginning of the next end step.
@@ -113077,7 +113077,7 @@ toughness=2
 [/card]
 [card]
 name=Steam Blast
-auto=damage:2 all(creature,player)
+auto=damage:2 all(creature) && damage:2 all(player)
 text=Steam Blast deals 2 damage to each creature and each player.
 mana={2}{R}
 type=Sorcery
@@ -113572,7 +113572,7 @@ toughness=4
 [/card]
 [card]
 name=Stitched Mangler
-auto=target(creature) freeze
+auto=target(creature|opponentBattlefield) freeze
 auto=tap(noevent)
 text=Stitched Mangler enters the battlefield tapped. -- When Stitched Mangler enters the battlefield, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.
 mana={2}{U}
@@ -115301,7 +115301,7 @@ type=Enchantment
 [/card]
 [card]
 name=Sulfurous Blast
-auto=if compare(restriction{assorcery}~morethan~0) then damage:3 all(creature,player) else damage:2 all(creature,player)
+auto=if compare(restriction{assorcery}~morethan~0) then damage:3 all(creature) && damage:3 all(player) else damage:2 all(creature) && damage:2 all(player)
 text=Sulfurous Blast deals 2 damage to each creature and each player. If you cast this spell during your main phase, Sulfurous Blast deals 3 damage to each creature and each player instead.
 mana={2}{R}{R}
 type=Instant
@@ -117315,7 +117315,7 @@ type=Artifact
 [card]
 name=Tainted Specter
 abilities=flying
-auto={1}{B}{B}{T}:name(offer choice) ability$!choice name(discard) target(*|myhand) reject && damage:1 all(creature,player) _ choice name(put on library) target(*|myhand) moveto(library)!$ targetedplayer
+auto={1}{B}{B}{T}:name(offer choice) ability$!choice name(discard) target(*|myhand) reject && damage:1 all(creature) && damage:1 all(player) _ choice name(put on library) target(*|myhand) moveto(library)!$ targetedplayer
 text=Flying -- {1}{B}{B}, {T}: Target player discards a card unless he or she puts a card from his or her hand on top of his or her library. If that player discards a card this way, Tainted Specter deals 1 damage to each creature and each player. Activate this ability only any time you could cast a sorcery.
 mana={3}{B}
 type=Creature
@@ -120838,7 +120838,7 @@ toughness=4
 [/card]
 [card]
 name=Thrashing Wumpus
-auto={B}:damage:1 all(creature,player)
+auto={B}:damage:1 all(creature) && damage:1 all(player)
 text={B}: Thrashing Wumpus deals 1 damage to each creature and each player.
 mana={3}{B}{B}
 type=Creature
@@ -121764,7 +121764,7 @@ toughness=2
 [card]
 name=Time Bomb
 auto=@each my upkeep:counter(0/0,1,Time)
-auto={1}{T}{S}:thisforeach(counter{0/0.1.Time}) damage:1 all(creature,player)
+auto={1}{T}{S}:thisforeach(counter{0/0.1.Time}) damage:1 all(creature) && damage:1 all(player)
 text=At the beginning of your upkeep, put a time counter on Time Bomb. -- {1}, {T}, Sacrifice Time Bomb: Time Bomb deals damage to each creature and each player equal to the number of time counters on Time Bomb.
 mana={4}
 type=Artifact
@@ -130201,7 +130201,7 @@ toughness=4
 [card]
 name=Volatile Rig
 auto=_ENRAGE_flipacoin loseability sacrifice all(this) loseabilityend flipend
-auto=_DIES_flipacoin loseability damage:4 all(creature,player) loseabilityend flipend
+auto=_DIES_flipacoin loseability damage:4 all(creature) && damage:4 all(player) loseabilityend flipend
 abilities=trample,mustattack
 text=Trample -- Volatile Rig attacks each turn if able. -- Whenever Volatile Rig is dealt damage, flip a coin. If you lose the flip, sacrifice Volatile Rig. -- When Volatile Rig dies, flip a coin. If you lose the flip, it deals 4 damage to each creature and each player.
 mana={4}
@@ -130231,7 +130231,7 @@ toughness=4
 [card]
 name=Volcanic Eruption
 target=<prex>mountain
-auto=destroy && damage:1 all(creature,player)
+auto=destroy && damage:1 all(creature) && damage:1 all(player)
 text=Destroy X target Mountains. Volcanic Eruption deals damage to each creature and each player equal to the number of Mountains destroyed this way.
 mana={X}{U}{U}{U}
 type=Sorcery
@@ -130239,7 +130239,7 @@ type=Sorcery
 [card]
 name=Volcanic Fallout
 abilities=nofizzle
-auto=damage:2 all(creature,player)
+auto=damage:2 all(creature) && damage:2 all(player)
 text=Volcanic Fallout can't be countered. -- Volcanic Fallout deals 2 damage to each creature and each player.
 mana={1}{R}{R}
 type=Instant
@@ -130823,7 +130823,7 @@ toughness=3
 [card]
 name=Wail of the Nim
 other={2}{B}{B} name(Entwine)
-auto=if paid(alternative) then regenerate all(creature|mybattlefield) && damage:1 all(creature,player)
+auto=if paid(alternative) then regenerate all(creature|mybattlefield) && damage:1 all(creature) && damage:1 all(player)
 auto=ifnot paid(alternative) then transforms((,newability[choice regenerate all(creature|mybattlefield)],newability[choice damage:1 all(creature;player)]))
 text=Choose one - Regenerate each creature you control; or Wail of the Nim deals 1 damage to each creature and each player. -- Entwine {B} (Choose both if you pay the entwine cost.)
 mana={2}{B}
@@ -134732,7 +134732,7 @@ type=Sorcery
 [/card]
 [card]
 name=Winter Sky
-auto=flipacoin winability damage:1 all(creature,player) winabilityend loseability all(player) draw:1 loseabilityend flipend
+auto=flipacoin winability damage:1 all(creature) && damage:1 all(player) winabilityend loseability all(player) draw:1 loseabilityend flipend
 text=Flip a coin. If you win the flip, Winter Sky deals 1 damage to each creature and each player. If you lose the flip, each player draws a card.
 mana={R}
 type=Sorcery
@@ -135068,7 +135068,7 @@ subtype=Aura
 [/card]
 [card]
 name=Withering Wisps
-auto={B}:damage:1 all(creature,player) limit:type:swamp[snow]:mybattlefield
+auto={B}:damage:1 all(creature) && damage:1 all(player) limit:type:swamp[snow]:mybattlefield
 auto=@each endofturn restriction{type(creature|battlefield)~lessthan~1}:sacrifice
 text=At the beginning of the end step, if no creatures are on the battlefield, sacrifice Withering Wisps. -- {B}: Withering Wisps deals 1 damage to each creature and each player. Activate this ability no more times each turn than the number of snow Swamps you control.
 mana={1}{B}{B}
diff --git a/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt b/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
index 347d8f749..0c3d60eb0 100644
--- a/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
+++ b/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
@@ -338,7 +338,7 @@ subtype=Ashiok
 [card]
 name=Ashiok, Sculptor of Fears
 auto=counter(0/0,5,loyalty)
-auto={C(0/0,2,Loyalty)}:name(+2: Draw a card and put two cards...) draw:1 controller && deplete:2 opponent deplete:2 controller
+auto={C(0/0,2,Loyalty)}:name(+2: Draw a card and put two cards...) draw:1 controller && all(player) deplete:2
 auto={C(0/0,-5,Loyalty)}:name(-5: Return target creature from graveyars) moveTo(myBattlefield) target(creature|Graveyard)
 auto={C(0/0,-11,Loyalty)}:name(-11: Gain control of all creatures..) moveTo(myBattlefield) all(creature|opponentBattlefield)
 text=+2: Draw a card. Each player mills two cards. -- -5: Put target creature card from a graveyard onto the battlefield under your control. -- -11: Gain control of all creatures target opponent controls.
@@ -665,7 +665,7 @@ name=Daretti, Ingenious Iconoclast
 auto=counter(0/0,3,loyalty)
 auto={C(0/0,1,Loyalty)}:name(+1: Create a 1/1 colorless Construct) token(Construct,Artifact Creature Construct,1/1,defender)
 auto={C(0/0,-1,Loyalty)}{S(artifact|mybattlefield)}:name(-1: Sacrifice artifact to destroy) target(creature,artifact|battlefield) destroy
-auto={C(0/0,-6,Loyalty)}:name(-6: Create three copies of an artifact...) target(artifact|graveyard,battlefield) clone && clone && clone
+auto={C(0/0,-6,Loyalty)}:name(-6: Create three copies of an artifact) name(Create three tokens) target(artifact|graveyard,battlefield) transforms((,newability[clone controller] ,newability[clone controller],newability[clone controller]))
 text=+1: Create a 1/1 colorless Construct artifact creature token with defender. -- -1: You may sacrifice an artifact. If you do, destroy target artifact or creature. -- -6: Choose target artifact card in a graveyard or artifact on the battlefield. Create three tokens that are copies of it.
 mana={1}{B}{R}
 type=Legendary Planeswalker
@@ -1269,7 +1269,7 @@ subtype=Jace
 [card]
 name=Jace Beleren
 auto=counter(0/0,3,loyalty)
-auto={C(0/0,2,Loyalty)}:name(+2: Each player draw) draw:1 controller && draw:1 opponent
+auto={C(0/0,2,Loyalty)}:name(+2: Each player draw) all(player) draw:1
 auto={C(0/0,-1,Loyalty)}:name(-1: Target player draw a card) draw:1 target(player)
 auto={C(0/0,-10,Loyalty)}:name(-10: Target player mils twenty) deplete:20 target(player)
 text=+2: Each player draws a card. -- -1: Target player draws a card. -- -10: Target player puts the top twenty cards of his or her library into his or her graveyard.