diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index 566c68280..278ead290 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -6083,7 +6083,7 @@ type=Instant
 name=Befuddle
 target=creature
 auto=-4/-0 
-auto=draw:1
+auto=draw:1 controller
 text=Target creature gets -4/-0 until end of turn. -- Draw a card.
 mana={2}{U}
 type=Instant
@@ -7789,7 +7789,8 @@ type=Instant
 [card]
 name=Bloodline Necromancer
 abilities=lifelink
-auto=may target(creature[vampire;wizard]|mygraveyard) moveTo(mybattlefield)
+auto=name(return Vampire) may target(vampire[creature]|mygraveyard) moveTo(mybattlefield)
+auto=name(return Wizard) may 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
@@ -12611,8 +12612,8 @@ toughness=1
 [card]
 name=Charmed Sleep
 target=creature
+auto=teach(creature) tap
 auto=teach(creature) doesnotuntap
-auto=tap
 text=Enchant creature -- When Charmed Sleep enters the battlefield, tap enchanted creature. -- Enchanted creature doesn't untap during its controller's untap step.
 mana={1}{U}{U}
 type=Enchantment
@@ -12995,8 +12996,8 @@ type=Instant
 [card]
 name=Chord of Calling
 other={convoke} name(Convoke)
-aicode=activate target(creature[manacost<=x]|mylibrary) moveto(myhand)
-auto=reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(<1>creature[manacost<=x]|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(myhand)])) optiononeend optiontwo name(shuffle) bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary and!(shuffle)! )! optiontwoend revealend
+aicode=activate target(creature[manacost<=x]|mylibrary) moveto(myBattlefield)
+auto=reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(<1>creature[manacost<=x]|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(myBattlefield)])) optiononeend optiontwo name(shuffle) bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary and!(shuffle)! )! optiontwoend revealend
 text=Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spell pays for {1} or one mana of that creature's color.) -- Search your library for a creature card with mana value X or less and put it onto the battlefield. Then shuffle your library.
 mana={X}{G}{G}{G}
 type=Instant
@@ -17307,6 +17308,7 @@ type=Sorcery
 name=Dargo, the Shipwrecker
 abilities=trample,partner
 other={2}{R}{S(*[artifact;creature]|mybattlefield)}{S(*[artifact;creature]|mybattlefield)} name(Sacrifice 2 permanents)
+otherrestriction=type(artifact,creature|myBattlefield)~morethan~1
 text=As an additional cost to cast this spell, you may sacrifice any number of artifacts and/or creatures. This spell costs {2} less to cast for each permanent sacrificed this way and {2} less to cast for each other artifact or creature you've sacrificed this turn. -- Trample -- Partner (You can have two commanders if both have partner.)
 mana={6}{R}
 type=Legendary Creature
@@ -17316,7 +17318,7 @@ toughness=5
 [/card]
 [card]
 name=Darigaaz Reincarnated
-abilities=flying, trample, haste
+abilities=flying,trample,haste
 autograveyard=_DIES_moveTo(exile) && counter(0/0,3,egg)
 autoexile=@each my upkeep:counter(0/0,-1,egg)
 autoexile=@each my upkeep:this(counter{0/0,1,egg}<1)while moveTo(battlefield)
@@ -42973,7 +42975,7 @@ toughness=6
 [card]
 name=Kogla, the Titan Ape
 auto=target(creature|opponentbattlefield) dynamicability<!powerstrike eachother!>
-auto=@combat(attaking) source(this):destroy target(artifact,enchantment|opponentBattlefield)
+auto=_ATTACKING_destroy target(artifact,enchantment|opponentBattlefield)
 auto={1}{G}{H(human|mybattlefield)}:indestructible ueot
 text=When Kogla, the Titan Ape enters the battlefield, it fights up to one target creature you don't control. -- Whenever Kogla attacks, destroy target artifact or enchantment defending player controls. -- {1}{G}: Return target Human you control to its owner's hand. Kogla gains indestructible until end of turn.
 mana={3}{G}{G}{G}
@@ -57014,7 +57016,7 @@ toughness=2
 [/card]
 [card]
 name=Platoon Dispenser
-auto=@each my endofturn:if type(creature|mybattlefield)~morethan~1 then draw:1
+auto=@each my endofturn:if type(creature|mybattlefield)~morethan~2 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}
@@ -78897,8 +78899,8 @@ type=Artifact
 [card]
 name=The Ur-Dragon
 abilities=flying
-auto=lord(dragon|mycastingzone) altercost(colorless,-1)
-autocommandzone=lord(dragon|mycastingzone) altercost(colorless,-1)
+auto=lord(other dragon|mycastingzone) altercost(colorless,-1)
+autocommandzone=lord(other dragon|mycastingzone) altercost(colorless,-1)
 auto=@combat(attacking) source(dragon|myBattlefield):draw:1 && transforms((,newability[moveTo(myBattlefield) target(*[-sorcery;-instant]|myhand)])) forever
 text=Eminence - As long as The Ur-Dragon is in the command zone or on the battlefield, other Dragon spells you cast cost {1} less to cast. -- Flying -- Whenever one or more Dragons you control attack, draw that many cards, then you may put a permanent card from your hand onto the battlefield.
 mana={4}{W}{U}{B}{R}{G}
@@ -79258,7 +79260,7 @@ type=Enchantment
 [/card]
 [card]
 name=Thraben Exorcism
-target=enchantment,spirit,creature[hasdisturb]
+target=enchantment,spirit
 auto=moveto(exile)
 text=Exile target Spirit, creature with disturb, or enchantment.
 mana={1}{W}
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 637905f95..10105f160 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -18951,7 +18951,7 @@ toughness=0
 [/card]
 [card]
 name=Chaotic Strike
-auto=flipacoin winability target(creature) 1/1 winabilityend flipend
+auto=flipacoin winability target(creature) 1/1 ueot winabilityend flipend
 auto=draw:1 controller
 restriction=blockersonly
 text=Cast Chaotic Strike only during combat after blockers are declared. -- Flip a coin. If you win the flip, target creature gets +1/+1 until end of turn. -- Draw a card.
@@ -40101,6 +40101,7 @@ subtype=Aura
 [card]
 name=Festival of the Guildpact
 auto=prevent:X controller
+auto=draw:1 controller
 text=Prevent the next X damage that would be dealt to you this turn. -- Draw a card.
 mana={X}{W}
 type=Instant
@@ -55140,7 +55141,7 @@ subtype=Aura
 [card]
 name=Holy Strength
 target=creature
-auto=1/2
+auto=teach(creature) 1/2
 text=Enchant creature -- Enchanted creature gets +1/+2.
 mana={W}
 type=Enchantment
@@ -70304,6 +70305,7 @@ type=Sorcery
 [/card]
 [card]
 name=Malfegor
+abilities=flying
 auto=if compare(phandcount)~morethan~0 then ability$!notatarget(<ohandcount>creature|mybattlefield) sacrifice!$ opponent && discard:phandcount controller
 text=Flying -- When Malfegor enters the battlefield, discard your hand. Each opponent sacrifices a creature for each card discarded this way.
 mana={2}{B}{B}{R}{R}
@@ -131463,7 +131465,7 @@ toughness=3
 [card]
 name=Wall of Resurgence
 abilities=defender
-auto=may target(land|mybattlefield) transforms((Elemental Creature,newability[counter(1/1,3)],newability[haste])) forever
+auto=may target(land|mybattlefield) transforms((Elemental Creature,newability[counter(1/1.3)],newability[haste])) forever
 text=Defender -- When Wall of Resurgence enters the battlefield, you may put three +1/+1 counters on target land you control. If you do, that land becomes a 0/0 Elemental creature with haste that's still a land.
 mana={2}{W}
 type=Creature