diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index 5c758bf89..69e06d60a 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -1158,8 +1158,8 @@ type=Enchantment
 [/card]
 [card]
 name=Aid the Fallen
-auto=name(creature and planeswalker) moveTo(ownerHand) target(creature|mygraveyard) and!(may moveTo(ownerHand) target(planeswalker|mygraveyard))!
-auto=moveTo(ownerHand) target(planeswalker|mygraveyard)
+auto=ability$!may moveTo(ownerHand) target(creature|mygraveyard)!$ controller
+auto=ability$!may moveTo(ownerHand) target(planeswalker|mygraveyard)!$ controller
 text=Choose one or both -- Return target creature card from your graveyard to your hand. -- Return target planeswalker card from your graveyard to your hand.
 mana={1}{B}
 type=Sorcery
@@ -3196,8 +3196,8 @@ type=Sorcery
 [/card]
 [card]
 name=Applied Biomancy
-auto=+1/+1 target(creature)
-auto=moveTo(ownerHand) target(creature)
+auto=ability$!may target(creature) 1/1 ueot!$ controller
+auto=ability$!may moveTo(ownerHand) target(creature)!$ controller
 text=Choose one or both -- Target creature gets +1/+1 until end of turn. -- Return target creature to its owner's hand.
 mana={G}{U}
 type=Instant
@@ -4626,9 +4626,8 @@ type=Sorcery
 [/card]
 [card]
 name=Artful Takedown
-auto=choice name(Tap creature) target(creature) tap(noevent)
-auto=choice name(Target creature gets -2/-4) target(creature) -2/-4 ueot
-auto=choice name(Choose both) target(creature) tap(noevent) && ability$!name(Target creature gets -2/-4) name(Target creature gets -2/-4) target(creature) -2/-4 ueot!$ controller
+auto=ability$!may target(creature) tap!$ controller
+auto=ability$!may target(creature) -2/-4 ueot!$ controller
 text=Choose one or both -- Tap target creature. -- Target creature gets -2/-4 until end of turn.
 mana={2}{U}{B}
 type=Instant
@@ -9544,7 +9543,7 @@ toughness=3
 [/card]
 [card]
 name=Blight-Breath Catoblepas
-auto=-manaB:mybattlefield/-manaB:mybattlefield target(creature|opponentBattlefield) ueot
+auto=-type:manaB:mybattlefield/-type:manaB:mybattlefield target(creature|opponentBattlefield) ueot
 text=When Blight-Breath Catoblepas enters the battlefield, target creature an opponent controls gets -X/-X until end of turn, where X is your devotion to black. (Each {B} in the mana costs of permanents you control counts toward your devotion to black.)
 mana={4}{B}{B}
 type=Creature
@@ -11899,10 +11898,8 @@ toughness=1
 [/card]
 [card]
 name=Branching Bolt
-target=creature
-other={1}{R}{R} name(Both)
-auto=if paid(alternative) then damage:3 && damage:3 target(creature[flying])
-auto=ifnot paid(alternative) then transforms((,newability[choice name(Damage Non-Flying) damage:3],newability[choice name(Damage Flying) target(creature[flying]) damage:3]))
+auto=ability$!may name(damage to creature with flying) target(creature[flying]) damage:3 !$ controller
+auto=ability$!may name(damage to creature without flying) target(creature[-flying]) damage:3 !$ controller
 text=Choose one or both Branching Bolt deals 3 damage to target creature with flying; and/or Branching Bolt deals 3 damage to target creature without flying.
 mana={1}{R}{G}
 type=Instant
@@ -14551,7 +14548,7 @@ toughness=2
 [card]
 name=Catapult Captain
 backside=Catapult Fodder
-auto={2}{B}{T}{S(other creature)mybattlefield}:damage:storedtoughness opponent
+auto={2}{B}{T}{S(other creature)|mybattlefield}:damage:storedtoughness opponent
 text={2}{B}, {T}, Sacrifice another creature: Target opponent loses life equal to the sacrificed creature's toughness. // Catapult Fodder
 color=black
 type=Creature
@@ -16966,7 +16963,7 @@ toughness=3
 name=Clackbridge Troll
 abilities=trample,haste
 auto=create(Goat:creature Goat:0/1:white)*3 opponent
-auto=@each my combatbegins restriction{type(creature|opponentbattlefield)~morethan~0}:ability$!name(sacrifice creature) notatarget(creature|mybattlefield) sacrifice!$ opponent && tap (this) && draw:1 controller && life:3 controller
+auto=@each my combatbegins restriction{type(creature|opponentbattlefield)~morethan~0}:ability$!may name(sacrifice creature) notatarget(creature|mybattlefield) sacrifice!$ opponent && tap (this) && draw:1 controller && life:3 controller
 text=Trample, haste -- When Clackbridge Troll enters the battlefield, target opponent creates three 0/1 white Goat creature tokens. -- At the beginning of combat on your turn, any opponent may sacrifice a creature. If a player does, tap Clackbridge Troll, you gain 3 life, and you draw a card.
 mana={3}{B}{B}
 type=Creature
@@ -22035,10 +22032,8 @@ type=Enchantment
 [/card]
 [card]
 name=Dawn to Dusk
-target=enchantment
-auto=choice name(Destroy) destroy
-auto=choice name(Return) moveTo(myhand) target(enchantment|mygraveyard)
-auto=choice name(Both) destroy && moveTo(myhand) target(enchantment|mygraveyard)
+auto=ability$!may name(Return) moveTo(myhand) target(enchantment|mygraveyard)!$ controller
+auto=ability$!may name(Destroy) destroy target(enchantment)!$ controller
 text=Choose one or both Return target enchantment card from your graveyard to your hand; and/or destroy target enchantment.
 mana={2}{W}{W}
 type=Sorcery
@@ -22510,9 +22505,8 @@ type=Sorcery
 [/card]
 [card]
 name=Deafening Clarion
-auto=choice name(Damage) damage:3 all(creature)
-auto=choice name(Lifelink) all(creature|myBattlefield) lifelink ueot
-auto=choice name(Damage and Lifelink) damage:3 all(creature) && all(creature|myBattlefield) lifelink ueot
+auto=ability$!may name(Damage) damage:3 all(creature)!$ controller
+auto=ability$!may name(Lifelink) all(creature|myBattlefield) lifelink ueot!$ controller
 text=Choose one or both -- Deafening Clarion deals 3 damage to each creature. -- Creatures you control gain lifelink until end of turn.
 mana={1}{R}{W}
 type=Sorcery
@@ -30857,8 +30851,8 @@ toughness=2
 [card]
 name=Evangel of Synthesis
 auto=choice _LOOT_
-auto=_SECOND_DRAW_menace ueot
-auto=_SECOND_DRAW_1/0 ueot
+auto=this(variable{pdrewcount}>1) menace ueot
+auto=this(variable{pdrewcount}>1) 1/0 ueot
 text=When Evangel of Synthesis enters the battlefield, draw a card, then discard a card. -- As long as you've drawn two or more cards this turn, Evangel of Synthesis gets +1/+0 and has menace.
 mana={U}{B}
 type=Creature
@@ -32108,7 +32102,7 @@ toughness=1
 [/card]
 [card]
 name=Ezuri's Predation
-auto=foreach(creature|opponentBattlefield) token(Beast,Creature Beast,4/4,green) and!( transforms((,newability[moveTo(this|myBattlefield) damage:dynamicability<!powerstrike!> target(other creature|opponentBattlefield]))) forever )! controller
+auto=foreach(creature|opponentBattlefield) token(Beast,Creature Beast,4/4,green)
 text=For each creature your opponents control, create a 4/4 green Beast creature token. Each of those Beasts fights a different one of those creatures.
 mana={5}{G}{G}{G}
 type=Sorcery
@@ -34761,9 +34755,8 @@ toughness=3
 [/card]
 [card]
 name=Fissure Vent
-auto=choice name(Destroy non-basic land) destroy target(land[-basic])
-auto=choice name(Destroy artifact) destroy target(artifact)
-auto=choice name(Destroy non-basic land and artifact) destroy target(land[-basic]) && ability$!name(Destroy artifact) name(Destroy artifact) destroy target(artifact)!$ controller
+auto=ability$! may name(Destroy artifact) destroy target(artifact)!$ controller
+auto=ability$! may name(Destroy non-basic land) destroy target(land[-basic])!$ controller
 text=Choose one or both -- Destroy target artifact. -- Destroy target nonbasic land.
 mana={3}{R}{R}
 type=Sorcery
@@ -36081,9 +36074,8 @@ type=Enchantment
 [/card]
 [card]
 name=Fortuitous Find
-target=*[artifact;creature]|mygraveyard
-auto=choice name(Return target artifact or creature) moveto(myhand)
-auto=choice name(Return target artifact and creature) moveto(myhand) && moveto(myhand) target(*[artifact;creature]|mygraveyard)
+auto=ability$! name(Return target artifact) may name(Return target artifact) moveto(myhand) target(artifact|mygraveyard)!$ controller
+auto=ability$! name(Return target creature) may name(Return target creature) moveto(myhand) target(creature|mygraveyard)!$ controller
 text=Choose one or both -- Return target artifact card from your graveyard to your hand. -- Return target creature card from your graveyard to your hand.
 mana={2}{B}
 type=Sorcery
@@ -42293,9 +42285,8 @@ type=Sorcery
 [/card]
 [card]
 name=Grim Discovery
-auto=choice name(Return target creature from your graveyard) moveTo(myhand) target(creature|mygraveyard)
-auto=choice name(Return target land from your graveyard) moveTo(myhand) target(land|mygraveyard)
-auto=choice name(Return target creature and land from your graveyard) moveTo(myhand) target(creature|mygraveyard) and!( moveTo(myhand) target(land|mygraveyard) )!
+auto=ability$! name(Return target creature) may name(Return target creature) moveTo(myhand) target(creature|mygraveyard)!$ controller
+auto=ability$! name(Return target land) may name(Return target land) moveTo(myhand) target(land|mygraveyard)!$ controller
 text=Choose one or both -- Return target creature card from your graveyard to your hand. -- Return target land card from your graveyard to your hand.
 mana={1}{B}
 type=Sorcery
@@ -53316,7 +53307,7 @@ name=Katsumasa, the Animator
 abilities=flying
 auto={2}{U}:name(Artifact nonvehicle becomes creature) target(artifact[-creature&-vehicle]|myBattlefield) transforms((Artifact Creature,setpower=1,settoughness=1,newability[flying])) ueot
 auto={2}{U}:name(Artifact vehicle becomes creature) target(artifact[-creature&vehicle]|myBattlefield) transforms((Artifact Creature,newability[flying])) ueot
-auto=@each my upkeep:name(Put 1/1 counters) counter(1/1) target(<upto:3>artifact[-creature]|battlefield)
+auto=@each my upkeep:may name(Put 1/1 counters) counter(1/1) target(<upto:3>artifact[-creature]|battlefield)
 text=Flying -- {2}{U}: Until end of turn, target noncreature artifact you control becomes an artifact creature and gains flying. If it's not a Vehicle, it has base power and toughness 1/1 until end of turn. -- At the beginning of your upkeep, put a +1/+1 counter on each of up to three target noncreature artifacts.
 mana={2}{U}{U}
 type=Legendary Creature
@@ -54489,7 +54480,7 @@ toughness=2
 [card]
 name=Kitesail Skirmisher
 abilities=flying
-auto=_ATTACKING_name(Other creature gains flying) target(other creature|myBattlefield) transforms((,newability[flying])) ueot
+auto=_ATTACKING_name(Other creature gains flying) target(other creature[attacking]|myBattlefield) flying ueot
 autograveyard={4}{U}:name(Activate Encore) name(Activate Encore) moveto(exile) and!(clone with(treason,haste,mustattack))! asSorcery
 text=Flying -- Whenever Kitesail Skirmisher attacks, another target creature attacking the same player or planeswalker gains flying until end of turn. -- Encore {4}{U} ({4}{U}, Exile this card from your graveyard: For each opponent, create a token copy that attacks that opponent this turn if able. They gain haste. Sacrifice them at the beginning of the next end step. Activate only as a sorcery.)
 mana={3}{U}
@@ -59835,18 +59826,18 @@ type=Instant
 [card]
 name=Majestic Myriarch
 auto=foreach(creature|mybattlefield) 2/2
-auto=@each my combatbegins restriction{type(creature[flying]|mybattlefield)~morethan~0}: flying ueot
-auto=@each my combatbegins restriction{type(creature[first strike]|mybattlefield)~morethan~0}: first strike ueot
-auto=@each my combatbegins restriction{type(creature[double strike]|mybattlefield)~morethan~0}: double strike ueot
-auto=@each my combatbegins restriction{type(creature[deathtouch]|mybattlefield)~morethan~0}: deathtouch ueot
-auto=@each my combatbegins restriction{type(creature[haste]|mybattlefield)~morethan~0}: haste ueot
-auto=@each my combatbegins restriction{type(creature[opponentshroud]|mybattlefield)~morethan~0}: opponentshroud ueot
-auto=@each my combatbegins restriction{type(creature[indestructible]|mybattlefield)~morethan~0}: indestructible ueot
-auto=@each my combatbegins restriction{type(creature[lifelink]|mybattlefield)~morethan~0}: lifelink ueot
-auto=@each my combatbegins restriction{type(creature[menace]|mybattlefield)~morethan~0}: menace ueot
-auto=@each my combatbegins restriction{type(creature[reach]|mybattlefield)~morethan~0}: reach ueot
-auto=@each my combatbegins restriction{type(creature[trample]|mybattlefield)~morethan~0}: trample ueot
-auto=@each my combatbegins restriction{type(creature[vigilance]|mybattlefield)~morethan~0}: vigilance ueot
+auto=@each combatbegins restriction{type(creature[flying]|mybattlefield)~morethan~0}: flying ueot
+auto=@each combatbegins restriction{type(creature[first strike]|mybattlefield)~morethan~0}: first strike ueot
+auto=@each combatbegins restriction{type(creature[double strike]|mybattlefield)~morethan~0}: double strike ueot
+auto=@each combatbegins restriction{type(creature[deathtouch]|mybattlefield)~morethan~0}: deathtouch ueot
+auto=@each combatbegins restriction{type(creature[haste]|mybattlefield)~morethan~0}: haste ueot
+auto=@each combatbegins restriction{type(creature[opponentshroud]|mybattlefield)~morethan~0}: opponentshroud ueot
+auto=@each combatbegins restriction{type(creature[indestructible]|mybattlefield)~morethan~0}: indestructible ueot
+auto=@each combatbegins restriction{type(creature[lifelink]|mybattlefield)~morethan~0}: lifelink ueot
+auto=@each combatbegins restriction{type(creature[menace]|mybattlefield)~morethan~0}: menace ueot
+auto=@each combatbegins restriction{type(creature[reach]|mybattlefield)~morethan~0}: reach ueot
+auto=@each combatbegins restriction{type(creature[trample]|mybattlefield)~morethan~0}: trample ueot
+auto=@each combatbegins restriction{type(creature[vigilance]|mybattlefield)~morethan~0}: vigilance ueot
 text=Majestic Myriarch's power and toughness are each equal to twice the number of creatures you control. -- At the beginning of each combat, Majestic Myriarch gains flying until end of turn if you control a creature with flying. The same is true for first strike, double strike, deathtouch, haste, hexproof, indestructible, lifelink, menace, reach, trample, and vigilance.
 mana={4}{G}
 type=Creature
@@ -71329,7 +71320,7 @@ type=Instant
 [card]
 name=Parasitic Impetus
 target=creature
-auto=teach(creature) transforms((,newability[counter(0/0.1.Goaded)],newability[this(counter{0/0.1.Goaded}>0) mustattack],newability[_ATTACKING_life:-2 controller],newability[_ATTACKING_life:2 opponent]))
+auto=teach(creature) transforms((,newability[counter(0/0.1.Goaded)],newability[this(counter{0/0.1.Goaded}>0) mustattack],newability[_ATTACKING_life:-2 controller],newability[_ATTACKING_life:2 owner]))
 auto=2/2
 text=Enchant creature -- 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, its controller loses 2 life and you gain 2 life.
 mana={2}{B}
@@ -77831,17 +77822,6 @@ power=3
 toughness=4
 [/card]
 [card]
-name=Ravenous Slime
-auto=cantbeblockedby(creature[power<=2])
-auto=@movedto(creature|opponentGraveyard) from(opponentBattlefield):moveTo(exile) && counter(1/1,storedpower)
-text=Ravenous Slime can't be blocked by creatures with power 2 or less. -- If a creature an opponent controls would die, instead exile it and put a number of +1/+1 counters equal to that creature's power on Ravenous Slime.
-mana={2}{G}
-type=Creature
-subtype=Ooze
-power=1
-toughness=1
-[/card]
-[card]
 name=Ravenous Squirrel
 auto=@sacrificed(*[creature;artifact]|mybattlefield):counter(1/1) all(this)
 auto={1}{B}{G}{S(*[creature;artifact]|mybattlefield)}:name(Gain life and draw) life:1 controller && draw:1 controller
@@ -81663,7 +81643,7 @@ type=Sorcery
 [card]
 name=Rohgahh, Kher Keep Overlord
 auto=lord(other kobold|myBattlefield) +2/+2
-auto=@movedTo(Kobold|mystack) may pay({2}):create(dragon:creature dragon:4/4:red:flying)
+auto=@movedTo(other Kobold|mystack) may pay({2}):create(dragon:creature dragon:4/4:red:flying)
 auto=@movedTo(Dragon|mystack):token(Kobolds of Kher Keep,creature kobold,0/1,red)
 text=Other Kobolds you control get +2/+2. -- Whenever you cast a Kobold spell, you may pay {2}. If you do, create a 4/4 red Dragon creature token with flying. -- Whenever you cast a Dragon spell, create a 0/1 red Kobold creature token named Kobolds of Kher Keep.
 mana={3}{B}{R}
@@ -85972,7 +85952,7 @@ type=Land
 [/card]
 [card]
 name=Second Breakfast
-auto=may name(Tap 2 creatures) target(<upto:2>creature|battlefield) tap
+auto=may target(<upto:2>creature|battlefield) 2/1
 auto=token(Food)
 text=Up to two target creatures each get +2/+1 until end of turn. Create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
 mana={2}{W}
@@ -86981,8 +86961,9 @@ toughness=4
 [/card]
 [card]
 name=Settle Beyond Reality
-auto=alternative target(creature|opponentbattlefield) moveto(exile)
-auto=alternative target(creature|mybattlefield) moveto(exile) and!(moveto(mybattlefield))!
+auto=choice name(Exile creature you don't control) target(creature|opponentbattlefield) moveto(exile)
+auto=choice name(Exile creature you control) target(creature|mybattlefield) moveto(exile) and!(moveto(mybattlefield))!
+auto=choice name(Choose both) target(creature|opponentbattlefield) moveto(exile) && ability$!target(creature|mybattlefield) moveto(exile) and!(moveto(mybattlefield))!!$ controller
 text=Choose one or both -- Exile target creature you don't control. -- Exile target creature you control, then return it to the battlefield under its owner's control.
 mana={4}{W}
 type=Sorcery
@@ -95724,9 +95705,8 @@ toughness=4
 [card]
 name=Storvald Effect
 abilities=doublefacedeath,nomovetrigger,nofizzle
-auto=choice name(Creature becomes 7/7) target(creature|battlefield) transforms((,setpower=7,settoughness=7)) ueot
-auto=choice name(Creature becomes 1/1) target(creature|battlefield) transforms((,setpower=1,settoughness=1)) ueot
-auto=choice name(Choose both) target(creature|battlefield) transforms((,setpower=7,settoughness=7,newability[name(Creature becomes 1/1) target(other creature|battlefield) transforms((,setpower=1,settoughness=1)) ueot])) ueot
+auto=ability$! name(Creature becomes 7/7) may name(Creature becomes 7/7) target(creature|battlefield) transforms((,setpower=7,settoughness=7)) ueot!$ controller
+auto=ability$! name(Creature becomes 1/1) may name(Creature becomes 1/1) target(creature|battlefield) transforms((,setpower=1,settoughness=1)) ueot!$ controller
 text=Choose one or both -- Target creature has base power and toughness 7/7 until end of turn. -- Target creature has base power and toughness 1/1 until end of turn.
 color=blue,white,green
 type=Instant
@@ -96147,9 +96127,8 @@ type=Sorcery
 [/card]
 [card]
 name=Subtle Strike
-auto=choice name(Target creature gets -1/-1) target(creature) -1/-1 ueot
-auto=choice name(Put a +1/+1 counter) counter(1/1) target(creature)
-auto=choice name(Choose both) target(creature) -1/-1 ueot && ability$!name(Put a +1/+1 counter) name(Put a +1/+1 counter) counter(1/1) target(creature)!$ controller
+auto=ability$! name(Target creature gets -1/-1) may name(Target creature gets -1/-1) target(creature) -1/-1 ueot!$ controller
+auto=ability$! name(Put a +1/+1 counter) may name(Put a +1/+1 counter) counter(1/1) target(creature)!$ controller
 text=Choose one or both -- Target creature gets -1/-1 until end of turn. -- Put a +1/+1 counter on target creature.
 mana={1}{B}
 type=Instant
@@ -97063,10 +97042,8 @@ toughness=1
 [/card]
 [card]
 name=Survivors' Bond
-other={1}{G} name(Both)
-target=creature|myGraveyard
-auto=if paid(alternative) then moveTo(myHand) && moveTo(myHand) target(creature[-human]|myGraveyard)
-auto=ifnot paid(alternative) then moveTo(myHand)
+auto=ability$! may moveTo(myHand) target(creature[human]|myGraveyard)!$ controller
+auto=ability$! may moveTo(myHand) target(creature[-human]|myGraveyard)!$ controller
 text=Choose one or both -- Return target Human creature card from your graveyard to your hand. -- Return target non-Human creature card from your graveyard to your hand.
 mana={1}{G}
 type=Sorcery
@@ -97396,9 +97373,8 @@ toughness=4
 [/card]
 [card]
 name=Swirling Torrent
-auto=alternative moveTo(ownerlibrary) target(creature)
-auto=alternative moveTo(ownerHand) target(creature)
-other={5}{U} name(Both)
+auto=ability$! name(Put on library) may name(Put on library) moveTo(ownerlibrary) target(creature)!$ controller
+auto=ability$! name(Return to hand) may name(Return to hand) moveTo(ownerHand) target(creature)!$ controller
 text=Choose one or both -- Put target creature on top of its owner's library. -- Return target creature to its owner's hand.
 mana={5}{U}
 type=Sorcery
@@ -104356,8 +104332,8 @@ toughness=7
 [/card]
 [card]
 name=Trench Stalker
-auto=_SECOND_DRAW_deathtouch ueot
-auto=_SECOND_DRAW_lifelink ueot
+auto=this(variable{pdrewcount}>1) deathtouch ueot
+auto=this(variable{pdrewcount}>1) lifelink ueot
 text=As long as you've drawn two or more cards this turn, Trench Stalker has deathtouch and lifelink.
 mana={4}{B}
 type=Creature
@@ -106274,7 +106250,7 @@ type=Sorcery
 name=Unnatural Aggression
 abilities=devoid
 target=creature|mybattlefield
-auto=transforms((,newability[target(creature|opponentbattlefield) dynamicability<!powerstrike eachother!> && exiledeath ueot])) ueot
+auto=transforms((,newability[dynamicability<!powerstrike eachother!> target(creature|opponentbattlefield) ueot])) forever
 restriction=type(creature|opponentbattlefield)~morethan~0
 text=Devoid (This card has no color.) -- Target creature you control fights target creature an opponent controls. If the creature an opponent controls would die this turn, exile it instead.
 mana={2}{G}
@@ -107278,9 +107254,8 @@ type=Legendary Enchantment
 [/card]
 [card]
 name=Vandalize
-auto=choice name(Destroy target artifact) destroy target(artifact) restriction{type(artifact|battlefield)~morethan~0}
-auto=choice name(Destroy target land) destroy target(land) restriction{type(land|battlefield)~morethan~0}
-auto=choice name(Destroy both) destroy target(artifact) && ability$!name(Destroy target land) destroy target(land)!$ controller restriction{type(*[artifact;land]|battlefield)~morethan~0}
+auto=ability$! name(Destroy artifact) may name(Destroy artifact) destroy target(artifact) restriction{type(artifact|battlefield)~morethan~0}!$ controller
+auto=ability$! name(Destroy land) may name(Destroy land) destroy target(land) restriction{type(land|battlefield)~morethan~0}!$ controller
 text=Choose one or both -- Destroy target artifact. -- Destroy target land.
 mana={4}{R}
 type=Sorcery
@@ -112143,9 +112118,8 @@ subtype=Aura
 [/card]
 [card]
 name=Winterflame
-auto=choice name(Tap creature) tap(noevent) target(creature)
-auto=choice name(Damage 2 target creature) damage:2 target(creature)
-auto=choice name(Choose both) tap(noevent) target(creature) && ability$!name(Damage 2 target creature) damage:2 target(creature)!$ controller
+auto=ability$! may tap target(creature)!$ controller
+auto=ability$! may damage:2 target(creature)!$ controller
 text=Choose one or both -- Tap target creature. -- Winterflame deals 2 damage to target creature.
 mana={1}{U}{R}
 type=Instant
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 99f8b9c5c..a3838a57e 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -21806,7 +21806,7 @@ name=Condescend
 target=*|stack
 auto=transforms((,newability[pay[[{value:storedx}]] name(pay {value} mana) donothing?fizzle])) forever
 aicode=activate transforms((,newability[all(*[zpos<=2]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=_SCRY2_
+auto=_SCRY2_ controller
 text=Counter target spell unless its controller pays {X}. -- Scry 2. (To scry 2, look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 mana={X}{U}
 type=Instant
@@ -53969,7 +53969,7 @@ auto=teach(creature) first strike
 auto=teach(creature) trample
 auto=teach(creature) haste
 auto={2}:equip
-auto={1}:aslongas(Sword of Kaldra|mybattlefield)aslongas(Shield of Kaldra|mybattlefield)aslongas(Helm of Kaldra|mybattlefield) token(-47449)
+auto={1}:aslongas(Sword of Kaldra|mybattlefield)aslongas(Shield of Kaldra|mybattlefield)aslongas(Helm of Kaldra|mybattlefield) token(-47449) limit:1
 text=Equipped creature has first strike, trample, and haste. -- {1}: If you control Equipment named Helm of Kaldra, Sword of Kaldra, and Shield of Kaldra, create Kaldra, a legendary 4/4 colorless Avatar creature token. Attach those Equipment to it. -- Equip {2}
 mana={3}
 type=Legendary Artifact
@@ -67275,7 +67275,6 @@ toughness=2
 name=Lightning Javelin
 target=anytarget
 auto=damage:3
-aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
 auto=_SCRY1_ controller
 text=Lightning Javelin deals 3 damage to target creature or player. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 mana={3}{R}
@@ -88912,7 +88911,7 @@ type=Artifact
 [/card]
 [card]
 name=Prismatic Omen
-auto=lord(land|myBattlefield) transforms((plains forest mountain swamp island,newability[{t}:add{w}],newability[{t}:add{g}],newability[{t}:add{r}],newability[{t}:add{b}],newability[{t}:add{u}]))
+auto=lord(land|myBattlefield) transforms((plains island swamp mountain forest))
 text=Lands you control are every basic land type in addition to their other types.
 mana={1}{G}
 type=Enchantment
@@ -94689,7 +94688,7 @@ type=Enchantment
 [/card]
 [card]
 name=Retreat to Hagra
-auto=_LANDFALL_name(Choose one) transforms((,newability[choice name(Creature gains 1/0 and deachtouch) 1/0 && deathtouch target(creature)],newability[choice life:-1 opponent && life:1 controller])) oneshot
+auto=_LANDFALL_name(Choose one) transforms((,newability[choice name(Creature gains 1/0 and deachtouch) target(creature) transforms((,newability[1/0],newability[deathtouch])) ueot],newability[choice life:-1 opponent && life:1 controller])) oneshot
 text=Landfall -- Whenever a land enters the battlefield under your control, choose one -- -- Target creature gets +1/+0 and gains deathtouch until end of turn. -- Each opponent loses 1 life and you gain 1 life.
 mana={2}{B}
 type=Enchantment
@@ -136752,7 +136751,7 @@ toughness=3
 [card]
 name=Yidris, Maelstrom Wielder
 abilities=trample
-auto=@movedto(*|mystack) restriction{didcombatdamagetofoe}:all(trigger[to]) transforms((,newability[cascade:plibrarycount])) ueot
+auto=@movedto(*|mystack) from(myHand) restriction{didcombatdamagetofoe}:all(trigger[to]) transforms((,newability[cascade:plibrarycount])) ueot
 text=Trample -- Whenever Yidris, Maelstrom Wielder deals combat damage to a player, as you cast spells from your hand this turn, they gain cascade. (When you cast the spell, exile cards from the top of your library until you exile a nonland card that costs less. You may cast it without paying its mana cost. Put the exiled cards on the bottom of your library in a random order.)
 mana={U}{B}{R}{G}
 type=Legendary Creature
diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp
index 95c6ce011..a10848352 100644
--- a/projects/mtg/src/MTGAbility.cpp
+++ b/projects/mtg/src/MTGAbility.cpp
@@ -2104,7 +2104,7 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
         observer->addObserver(NEW MTGTempFlashBackRule(observer, -1));
         return NULL;
     }
-    //alternative cost type flashback
+    //alternative cost type bestow
     found = s.find("bestowrule");
     if (found != string::npos)
     {
diff --git a/projects/mtg/src/Rules.cpp b/projects/mtg/src/Rules.cpp
index f82258b58..3135ca719 100644
--- a/projects/mtg/src/Rules.cpp
+++ b/projects/mtg/src/Rules.cpp
@@ -459,7 +459,7 @@ Player * Rules::loadPlayerRandomCommander(GameObserver* observer, int isAI)
         numLands /= colors.size() - 1;
         for (unsigned int i = 1; i < colors.size(); i++)
         {
-            tempDeck->addRandomCards(numLands, 0, 0, Constants::RARITY_L, lands[colors.data()[i]].c_str());
+            tempDeck->addRandomCards(numLands, 0, 0, -1, lands[colors.data()[i]].c_str());
         }
     }
     else { tempDeck->addRandomCards(numLands, 0, 0, Constants::RARITY_L); }