diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index 00c57c69f..86079558e 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -3079,7 +3079,7 @@ toughness=4
 [card]
 name=Archway Commons
 auto=tap(noevent)
-auto=pay[[{1}]] name(pay 1 mana) donothing'sacrifice
+auto=pay[[{1}]] name(pay 1 mana) donothing?sacrifice
 auto={T}:add{R}
 auto={T}:add{U}
 auto={T}:add{G}
@@ -3800,7 +3800,7 @@ toughness=7
 name=Atla Palani, Nest Tender
 aicode=activate transforms((,newability[all(*[zpos=findfirsttypecreature]|mylibrary) moveto(myBattlefield) and!( all(*[zpos<=findfirsttypecreature]|mylibrary) moveto(myreveal) and!( bottomoflibrary )! )!])) oneshot
 auto={2}{T}:token(Egg,Creature Egg,0/1,green,defender)
-auto=@movedTo(egg|graveyard) from(mybattlefield):Reveal:1 revealzone(mylibrary) revealuntil(creature|mylibrary) optionone choice name(Get Card) target(creature|reveal) moveto(myhand) optiononeend optiontwo choice name(put on bottom) target(*|reveal) bottomoflibrary and!( all(*|reveal) bottomoflibrary )! optiontwoend revealend
+auto=@movedTo(egg|graveyard) from(mybattlefield):Reveal:1 revealzone(mylibrary) revealuntil(creature|mylibrary) optionone choice name(Get Card) target(creature|reveal) moveto(myBattlefield) optiononeend optiontwo choice name(put on bottom) target(*|reveal) bottomoflibrary and!( all(*|reveal) bottomoflibrary )! optiontwoend revealend
 text={2}, {T}: Create a 0/1 green Egg creature token with defender. -- Whenever an Egg you control dies, reveal cards from the top of your library until you reveal a creature card. Put that card onto the battlefield and the rest on the bottom of your library in a random order.
 mana={1}{R}{G}{W}
 type=Legendary Creature
@@ -6214,7 +6214,7 @@ toughness=3
 [/card]
 [card]
 name=Birthing Boughs
-auto={4}{T}:token(Shapeshifter,artifact creature Shapeshifter,2/2,changeling)
+auto={4}{T}:token(Shapeshifter,creature Shapeshifter,2/2,changeling)
 text={4}, {T}: Create a 2/2 colorless Shapeshifter creature token with changeling. (It has every creature type.)
 mana={3}
 type=Artifact
@@ -10639,7 +10639,7 @@ toughness=2
 name=Cauldron Familiar
 auto=life:1
 auto=life:-1 opponent
-auto={S(food|myBattlefield)}:moveto(myBattlefield)
+autograveyard={S(food|myBattlefield)}:moveto(myBattlefield)
 text=When Cauldron Familiar enters the battlefield, each opponent loses 1 life and you gain 1 life. -- Sacrifice a Food: Return Cauldron Familiar from your graveyard to the battlefield.
 mana={B}
 type=Creature
@@ -14546,7 +14546,7 @@ color=blue
 [/card]
 [card]
 name=Crack Open
-target=enchantment
+target=artifact,enchantment
 auto=destroy
 auto=token(Treasure Sur)
 text=Destroy target artifact or enchantment. Create a Treasure token. (It's an artifact with " {T}, Sacrifice this artifact: Add one mana of any color.")
@@ -24057,7 +24057,7 @@ auto=counter(0/0,1,Lore)
 auto=@each my firstmain:counter(0/0,1,Lore)
 auto=may name(Put 1/1 counter) target(creature) counter(1/1)
 auto=@counteradded(0/0,1,Lore) from(this):this(counter{0/0.2.Lore}=) may name(Put 1/1 counter) target(creature) counter(1/1)
-auto=@counteradded(0/0,1,Lore) from(this):this(counter{0/0.3.Lore}) name(Exile creature) target(creature[power=power:highest:*:opponentbattlefield]) moveTo(exile)
+auto=@counteradded(0/0,1,Lore) from(this):this(counter{0/0.3.Lore}) name(Exile creature) notATarget(creature) moveTo(exile)
 auto=@counteradded(0/0,1,Lore) from(this):this(counter{0/0.3.Lore}) sacrifice(this)
 text=(As this Saga enters and after your draw step, add a lore counter. Sacrifice after III.) -- I, II - Put a +1/+1 counter on up to one target creature. -- III - Exile a creature with the greatest power among creatures target opponent controls.
 mana={1}{G}{W}
@@ -24536,6 +24536,7 @@ toughness=3
 name=Feasting Troll King
 auto=vigilance,trample
 auto=if casted(this) then token(Food)
+autograveyard={S(food|myBattlefield)}{S(food|myBattlefield)}{S(food|myBattlefield)}:moveto(myBattlefield) myturnonly
 text=Vigilance, trample -- When Feasting Troll King enters the battlefield, if you cast it from your hand, create three Food tokens. (They're artifacts with "{2}, {T}, Sacrifice this artifact: You gain 3 life.") -- Sacrifice three Foods: Return Feasting Troll King from your graveyard to the battlefield. Activate this ability only during your turn.
 mana={2}{G}{G}{G}{G}
 type=Creature
@@ -37360,7 +37361,7 @@ toughness=4
 [/card]
 [card]
 name=Ironroot Warlord
-anyzone=type:creature:myBattlefield/type:creature:myBattlefield cdaactive
+anyzone=type:creature:myBattlefield/5 cdaactive
 auto={3}{G}{W}:token(Soldier,Creature Soldier,1/1,white)
 text=Ironroot Warlord's power is equal to the number of creatures you control. -- {3}{G}{W}: Create a 1/1 white Soldier creature token.
 mana={1}{G}{W}
@@ -54677,7 +54678,8 @@ type=Enchantment
 [card]
 name=Psychic Symbiont
 abilities=flying
-auto=target(opponent) ability$!name(discard) reject notatarget(*|myhand)!$ && draw:1
+auto=target(opponent) ability$!name(discard) reject notatarget(*|myhand)!$
+auto=draw:1 controller
 text=Flying -- When Psychic Symbiont enters the battlefield, target opponent discards a card and you draw a card.
 mana={4}{U}{B}
 type=Creature
@@ -61026,7 +61028,7 @@ toughness=3
 [card]
 name=Saryth, the Viper's Fang
 auto=lord(other creature[tapped]|myBattlefield) deathtouch
-auto=lord(other creature[-tapped]|myBattlefield) hexproof
+auto=lord(other creature[-tapped]|myBattlefield) opponentshroud
 auto={1}{T}:name(Untap creature or land) target(other *[creature;land]|myBattlefield) untap
 text=Other tapped creatures you control have deathtouch. -- Other untapped creatures you control have hexproof. -- {1}, {T}: Untap another target creature or land you control.
 type=Legendary Creature
@@ -66701,7 +66703,7 @@ type=Instant
 [/card]
 [card]
 name=Song of the Dryads
-target=*|battlefield
+target=artifact,creature,enchantment,land,planeswalker
 auto=teach(creature) loseabilities
 auto=teach(creature) transforms((removetypes,newability[becomes(Forest Land)],newability[{T}:add{G}])) forever
 text=Enchant permanent -- Enchanted permanent is a colorless Forest land.
@@ -70423,7 +70425,7 @@ auto=this(variable{hasevict}>0) transforms((,newability[_DIES_name(Return exiled
 text=Imprint - When Summoner's Egg enters the battlefield, you may exile a card from your hand face down. -- When Summoner's Egg dies, turn the exiled card face up. If it's a creature card, put it onto the battlefield under your control.
 mana={4}
 type=Artifact Creature
-subtype=Construct
+subtype=Egg
 power=0
 toughness=4
 [/card]
@@ -71482,7 +71484,7 @@ type=Instant
 [/card]
 [card]
 name=Syphon Essence
-target=creature,planeswalker
+target=*[creature;planeswalker]|stack
 auto=fizzle
 auto=token(Blood) controller
 text=Counter target creature or planeswalker spell. Create a Blood token. (It's an artifact with "{1}, {T}, Discard a card, Sacrifice this artifact: Draw a card.")
@@ -80867,11 +80869,12 @@ toughness=2
 [/card]
 [card]
 name=Wayward Swordtooth
-abilities=cantattack,cantblock
+abilities=cantattack,cantpwattack,cantblock
 auto=maxPlay(land)+1
 auto=_ASCEND_
 auto=@movedTo(*|myBattlefield) restriction{type(City's Blessing|mybattlefield)~equalto~0}:_ASCEND_
 auto=_CITY'S_BLESSING_ transforms((,newability[-cantattack]))
+auto=_CITY'S_BLESSING_ transforms((,newability[-cantpwattack]))
 auto=_CITY'S_BLESSING_ transforms((,newability[-cantblock]))
 text=Ascend (If you control ten or more permanents, you get the city's blessing for the rest of the game.) -- You may play an additional land on each of your turns. -- Wayward Swordtooth can't attack or block unless you have the city's blessing.
 mana={2}{G}
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index a61a5d9f9..39a8a7fc7 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -31034,7 +31034,7 @@ auto=_DIES_token(-370660)
 text=Defender. -- When Dragon Egg dies, put a 2/2 red Dragon creature token with flying onto the battlefield. It has "{R}: This creature gets +1/+0 until end of turn".
 mana={2}{R}
 type=Creature
-subtype=Dragon
+subtype=Dragon Egg
 power=0
 toughness=2
 [/card]
@@ -68908,7 +68908,7 @@ auto=@counteradded(0/0,1,Hatchling) from(this):this(counter{0/0.5.Hatchling}) re
 text={1}{U}: Put a hatchling counter on Ludevic's Test Subject. Then if there are five or more hatchling counters on it, remove all of them and transform it. // Ludevic's Abomination
 mana={1}{U}
 type=Creature
-subtype=Lizard
+subtype=Lizard Egg
 power=0
 toughness=3
 [/card]
@@ -96241,7 +96241,7 @@ auto=_DIES_token(Bird,creature bird, 3/3,flying,white)
 text=Defender -- When Roc Egg dies, put a 3/3 white Bird creature token with flying onto the battlefield.
 mana={2}{W}
 type=Creature
-subtype=Bird
+subtype=Bird Egg
 power=0
 toughness=3
 [/card]
@@ -97346,7 +97346,7 @@ auto=@movedTo(graveyard) from(this|battlefield):phaseaction[endofturn once] toke
 text=When Rukh Egg dies, put a 4/4 red Bird creature token with flying onto the battlefield at the beginning of the next end step.
 mana={3}{R}
 type=Creature
-subtype=Bird
+subtype=Bird Egg 
 power=0
 toughness=3
 [/card]