diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 019d22c91..9525035d9 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -22,7 +22,7 @@ toughness=2
 [/card]
 [card]
 name=AEther Charge
-auto=@movedTo(beast|myBattlefield):may damage:4 opponent
+auto=@movedTo(beast|myBattlefield):all(trigger[to]) transforms((,newability[may damage:4 target(opponent)]))
 text=Whenever a Beast enters the battlefield under your control, you may have it deal 4 damage to target opponent.
 mana={4}{R}
 type=Enchantment
@@ -110,19 +110,7 @@ type=Instant
 [card]
 name=AEther Vial
 auto=@each my upkeep:may counter(0/0.1.Charge)
-auto=this(counter{0/0.1.Charge}<1) {T}:moveTo(myBattlefield) target(creature[manacost=0]|myhand)
-auto=this(counter{0/0.1.Charge}=) {T}:moveTo(myBattlefield) target(creature[manacost=1]|myhand)
-auto=this(counter{0/0.2.Charge}=) {T}:moveTo(myBattlefield) target(creature[manacost=2]|myhand)
-auto=this(counter{0/0.3.Charge}=) {T}:moveTo(myBattlefield) target(creature[manacost=3]|myhand)
-auto=this(counter{0/0.4.Charge}=) {T}:moveTo(myBattlefield) target(creature[manacost=4]|myhand)
-auto=this(counter{0/0.5.Charge}=) {T}:moveTo(myBattlefield) target(creature[manacost=5]|myhand)
-auto=this(counter{0/0.6.Charge}=) {T}:moveTo(myBattlefield) target(creature[manacost=6]|myhand)
-auto=this(counter{0/0.7.Charge}=) {T}:moveTo(myBattlefield) target(creature[manacost=7]|myhand)
-auto=this(counter{0/0.8.Charge}=) {T}:moveTo(myBattlefield) target(creature[manacost=8]|myhand)
-auto=this(counter{0/0.9.Charge}=) {T}:moveTo(myBattlefield) target(creature[manacost=9]|myhand)
-auto=this(counter{0/0.10.Charge}=) {T}:moveTo(myBattlefield) target(creature[manacost=10]|myhand)
-auto=this(counter{0/0.11.Charge}=) {T}:moveTo(myBattlefield) target(creature[manacost=11]|myhand)
-auto=this(counter{0/0.12.Charge}=) {T}:moveTo(myBattlefield) target(creature[manacost=12]|myhand)
+auto={T}:moveTo(myBattlefield) notatarget(creature[manacost=counter{0%0.1.Charge}]|myhand)
 text=At the beginning of your upkeep, you may put a charge counter on AEther Vial. -- {T}: You may put a creature card with converted mana cost equal to the number of charge counters on AEther Vial from your hand onto the battlefield.
 mana={1}
 type=Artifact
@@ -337,8 +325,8 @@ type=Sorcery
 [/card]
 [card]
 name=Abuna Acolyte
-auto={T}:prevent:1 target(creature,player)
-auto={T}:prevent:2 target(creature[artifact])
+auto={T}:name(prevent 1 damage) prevent:1 target(creature,player)
+auto={T}:name(prevent 2 damage) prevent:2 target(creature[artifact])
 text={T}: Prevent the next 1 damage that would be dealt to target creature or player this turn. -- {T}: Prevent the next 2 damage that would be dealt to target artifact creature this turn.
 mana={1}{W}
 type=Creature
@@ -359,7 +347,7 @@ toughness=2
 [/card]
 [card]
 name=Abyssal Hunter
-auto={B}{T}:target(creature) dynamicability<!powerstrike!> tap
+auto={B}{T}:name(tap target creature) target(creature) tap && dynamicability<!powerstrike!>
 text={B}, {T}: Tap target creature. Abyssal Hunter deals damage equal to Abyssal Hunter's power to that creature.
 mana={3}{B}
 type=Creature
@@ -422,7 +410,7 @@ toughness=2
 [/card]
 [card]
 name=Academy Researchers
-auto=may target(aura|myhand) newtarget
+auto=may name(attach an aura) target(aura|myhand) newtarget
 text=When Academy Researchers enters the battlefield, you may put an Aura card from your hand onto the battlefield attached to Academy Researchers.
 mana={1}{U}{U}
 type=Creature
@@ -809,6 +797,7 @@ type=Instant
 [card]
 name=Afiya Grove
 auto=counter(1/1,3)
+auto=this(counter{1/1}<1)while sacrifice
 auto=@each my upkeep:choice counter(1/1,1) target(creature) && counter(1/1,-1) all(this) && bury all(Afiya Grove[-counter{1/1.1}])
 text=Afiya Grove enters the battlefield with three +1/+1 counters on it. -- At the beginning of your upkeep, move a +1/+1 counter from Afiya Grove onto target creature. -- When Afiya Grove has no +1/+1 counters on it, sacrifice it.
 mana={1}{G}
@@ -923,7 +912,7 @@ type=Instant
 [card]
 name=Agonizing Memories
 target=player
-auto=target(<2>*|targetedpersonshand) moveTo(opponentlibrary)
+auto=target(<2>*|targetedpersonshand) moveTo(targetedpersonslibrary)
 text=Look at target player's hand and choose two cards from it. Put them on top of that player's library in any order.
 mana={2}{B}{B}
 type=Sorcery
@@ -1529,11 +1518,12 @@ toughness=2
 [/card]
 [card]
 name=Allied Strategies
-auto=aslongas(plains|myBattlefield) draw:1
-auto=aslongas(island|myBattlefield) draw:1
-auto=aslongas(swamp|myBattlefield) draw:1
-auto=aslongas(mountain|myBattlefield) draw:1
-auto=aslongas(forest|myBattlefield) draw:1
+target=player
+auto=if type(plains[basic]|targetedpersonsbattlefield)~morethan~0 then draw:1 targetedplayer
+auto=if type(island[basic]|targetedpersonsbattlefield)~morethan~0 then draw:1 targetedplayer
+auto=if type(mountain[basic]|targetedpersonsbattlefield)~morethan~0 then draw:1 targetedplayer
+auto=if type(swamp[basic]|targetedpersonsbattlefield)~morethan~0 then draw:1 targetedplayer
+auto=if type(forest[basic]|targetedpersonsbattlefield)~morethan~0 then draw:1 targetedplayer
 text=Domain - Target player draws a card for each basic land type among lands he or she controls.
 mana={4}{U}
 type=Sorcery
@@ -1740,7 +1730,7 @@ toughness=1
 [card]
 name=Amnesia
 target=player
-auto=target(*|targetedpersonshand) 0/0
+auto=name(look) target(*|targetedpersonshand) 0/0
 auto=reject all(*[-land]|targetedpersonshand)
 text=Target player reveals his or her hand and discards all nonland cards.
 mana={3}{U}{U}{U}
@@ -1834,7 +1824,7 @@ type=Artifact
 [/card]
 [card]
 name=Amulet of Unmaking
-auto={5}{T}:moveTo(exile) all(this) && moveTo(exile) target(artifact,creature,land) asSorcery
+auto={5}{T}{E}:name(exile) ability$!name(exile target) moveTo(exile) target(artifact,creature,land)!$ controller asSorcery
 text={5}, {T}, Exile Amulet of Unmaking: Exile target artifact, creature, or land. Activate this ability only any time you could cast a sorcery.
 mana={5}
 type=Artifact
@@ -1962,7 +1952,7 @@ type=Sorcery
 [/card]
 [card]
 name=Anathemancer
-auto=foreach(land[-basic]|opponentBattlefield) damage:1 opponent
+auto=name(choose target player) target(player) damage:type:land[-basic]:targetedpersonsbattlefield
 autograveyard={5}{B}{R}:moveto(mybattlefield) && transforms((,unearth,haste)) asSorcery forever
 text=When Anathemancer enters the battlefield, it deals damage to target player equal to the number of nonbasic lands that player controls. -- Unearth {5}{B}{R} ({5}{B}{R}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={1}{B}{R}
@@ -2707,7 +2697,7 @@ toughness=1
 [/card]
 [card]
 name=Aphetto Grifter
-auto={T(wizard|myBattlefield)}{T(wizard|myBattlefield)}:tap target(*)
+auto={T(wizard|myBattlefield)}{T(wizard|myBattlefield)}:name(tap a perminent) tap target(*)
 text=Tap two untapped Wizards you control: Tap target permanent.
 mana={2}{U}
 type=Creature
@@ -2731,7 +2721,7 @@ name=Aphotic Wisps
 target=creature
 auto=fear
 auto=transforms((,black)) ueot
-auto=draw:1 comtroller
+auto=draw:1 controller
 text=Target creature becomes black and gains fear until end of turn. (It can't be blocked except by artifact creatures and/or black creatures.) -- Draw a card.
 mana={B}
 type=Instant
@@ -3566,16 +3556,16 @@ type=Artifact
 [/card]
 [card]
 name=Armament Master
-auto=this(gear = 1) lord(other creature[kor]|myBattlefield) 2/2
-auto=this(gear = 2) lord(other creature[kor]|myBattlefield) 4/4
-auto=this(gear = 3) lord(other creature[kor]|myBattlefield) 6/6
-auto=this(gear = 4) lord(other creature[kor]|myBattlefield) 8/8
-auto=this(gear = 5) lord(other creature[kor]|myBattlefield) 10/10
-auto=this(gear = 6) lord(other creature[kor]|myBattlefield) 12/12
-auto=this(gear = 7) lord(other creature[kor]|myBattlefield) 14/14
-auto=this(gear = 8) lord(other creature[kor]|myBattlefield) 16/16
-auto=this(gear = 9) lord(other creature[kor]|myBattlefield) 18/18
-auto=this(gear = 10) lord(other creature[kor]|myBattlefield) 20/20
+auto=this(gear=1) lord(other creature[kor]|myBattlefield) 2/2
+auto=this(gear=2) lord(other creature[kor]|myBattlefield) 4/4
+auto=this(gear=3) lord(other creature[kor]|myBattlefield) 6/6
+auto=this(gear=4) lord(other creature[kor]|myBattlefield) 8/8
+auto=this(gear=5) lord(other creature[kor]|myBattlefield) 10/10
+auto=this(gear=6) lord(other creature[kor]|myBattlefield) 12/12
+auto=this(gear=7) lord(other creature[kor]|myBattlefield) 14/14
+auto=this(gear=8) lord(other creature[kor]|myBattlefield) 16/16
+auto=this(gear=9) lord(other creature[kor]|myBattlefield) 18/18
+auto=this(gear=10) lord(other creature[kor]|myBattlefield) 20/20
 text=Other Kor creatures you control get +2/+2 for each Equipment attached to Armament Master.
 mana={W}{W}
 type=Creature
@@ -56606,7 +56596,7 @@ type=Land
 [card]
 name=Peek
 target=player
-auto=target(*|targetedpersonshand) 0/0
+auto=name(see target hand) target(*|targetedpersonshand) 0/0
 auto=draw:1 controller
 text=Look at target player's hand. -- Draw a card.
 mana={U}
@@ -56952,7 +56942,7 @@ type=Enchantment
 [card]
 name=Persecute
 target=player
-auto=target(*|targetedpersonshand) 0/0
+auto=name(see target hand) target(*|targetedpersonshand) 0/0
 auto=chooseacolor all(*[chosencolor]|targetedpersonshand) reject chooseend
 text=Choose a color. Target player reveals his or her hand and discards all cards of that color.
 mana={2}{B}{B}
@@ -73097,7 +73087,7 @@ toughness=1
 [card]
 name=Sorcerous Sight
 target=opponent
-auto=target(*|targetedpersonshand) 0/0
+auto=name(see target hand) target(*|targetedpersonshand) 0/0
 auto=draw:1 controller
 text=Look at target opponent's hand. -- Draw a card.
 mana={U}
@@ -82474,7 +82464,7 @@ toughness=3
 [card]
 name=Trapfinder's Trick
 target=player
-auto=target(*|targetedpersonshand) 0/0
+auto= name(see target hand)target(*|targetedpersonshand) 0/0
 auto=all(trap|targetedpersonshand) reject
 text=Target player reveals his or her hand and discards all Trap cards.
 mana={1}{U}