diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index 1f9218032..8315ab347 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -11006,8 +11006,8 @@ type=Sorcery
 [/card]
 [card]
 name=Brimaz, Blight of Oreskos
-auto=@movedTo(creature[artifact]|mystack):name(Incubate X) name(Incubate X) all(trigger[to]) transforms((,newability[name(Incubate X) name(Incubate X) token(Incubator) and!( counter(1/1.manacost) )!)])) oneshot
-auto=@movedTo(creature[-artifact&phyrexian]|mystack):name(Incubate X) name(Incubate X) all(trigger[to]) transforms((,newability[name(Incubate X) name(Incubate X) token(Incubator) and!( counter(1/1.manacost) )!)])) oneshot
+auto=@movedTo(creature[artifact]|mystack):name(Incubate X) name(Incubate X) all(trigger[to]) transforms((,newability[name(Incubate X) name(Incubate X) token(Incubator) and!( counter(1/1.manacost) )!])) oneshot
+auto=@movedTo(creature[-artifact&phyrexian]|mystack):name(Incubate X) name(Incubate X) all(trigger[to]) transforms((,newability[name(Incubate X) name(Incubate X) token(Incubator) and!( counter(1/1.manacost) )!])) oneshot
 auto=@movedTo(phyrexian|graveyard) from(mybattlefield):name(Phyrexian died) transforms((,newability[@each endofturn:name(Proliferate) _PROLIFERATE_])) ueot
 text=Whenever you cast a Phyrexian creature or artifact creature spell, incubate X, where X is that spell's mana value. (Create an Incubator token with X +1/+1 counters on it and "{2}: Transform this artifact." It transforms into a 0/0 Phyrexian artifact creature.) -- At the beginning of each end step, if a Phyrexian died under your control this turn, proliferate.
 mana={2}{W}{B}
@@ -26635,7 +26635,7 @@ type=Sorcery
 [/card]
 [card]
 name=Emry, Lurker of the Loch
-ability=affinityartifacts
+abilities=affinityartifacts
 auto=deplete:4 controller
 auto={T}:target(artifact|mygraveyard) canplayfromgraveyard ueot
 text=This spell costs {1} less to cast for each artifact you control. -- When Emry, Lurker of the Loch enters the battlefield, put the top four cards of your library into your graveyard. -- {T}: Choose target artifact card in your graveyard. You may cast that card this turn. (You still pay its costs. Timing rules still apply.)
@@ -30599,8 +30599,8 @@ type=Sorcery
 [card]
 name=Firecat Blitz
 flashback={R}{R}
-auto=ifnot gravecast then token(Elemental Cat,Creature Elemental Cat,3/1,red,haste,unearth)*fullpaid
-auto=if gravecast then name(Sacrifice X mountains) name(Sacrifice X mountains) target(<anyamount>mountain|myBattlefield) sacrifice and!( token(Elemental Cat,Creature Elemental Cat,3/1,red,haste,unearth) )!
+auto=ifnot gravecast then token(Elemental Cat,Creature Elemental Cat,1/1,red,haste,unearth)*fullpaid
+auto=if gravecast then name(Sacrifice X mountains) name(Sacrifice X mountains) target(<anyamount>mountain|myBattlefield) sacrifice and!( token(Elemental Cat,Creature Elemental Cat,1/1,red,haste,unearth) )!
 text=Put X 1/1 red Elemental Cat creature tokens with haste onto the battlefield. Exile them at the beginning of the next end step. -- Flashback-{R}{R}, Sacrifice X Mountains. (You may cast this card from your graveyard for its flashback cost. Then exile it.)
 mana={X}{R}{R}
 type=Sorcery
@@ -33910,7 +33910,7 @@ toughness=4
 [card]
 name=Ghalta and Mavren
 abilities=trample
-auto=@each my blockers:name(Choose one) transforms((,newability[choice name(Create Dinosaur) token(Dinosaur^Creature Dinosaur^power:highest:creature[attacking]:mybattlefield/power:highest:creature[attacking]:mybattlefield^trample^battleready)],newability[choice name(Create vampires) token(Vampire^Creature Vampire^1/1^white^lifelink)*type:creature[attacking]:myBattlefield])) oneshot
+auto=@each my blockers:name(Choose one) transforms((,newability[choice name(Create Dinosaur) token(Dinosaur^Creature Dinosaur^otherpower:highest:creature[attacking]:mybattlefield/otherpower:highest:creature[attacking]:mybattlefield^trample^battleready)],newability[choice name(Create vampires) token(Vampire^Creature Vampire^1/1^white^lifelink)*type:creature[attacking]:myBattlefield])) oneshot
 text=Trample -- Whenever you attack, choose one -- Create a tapped and attacking X/X green Dinosaur creature token with trample, where X is the greatest power among other attacking creatures. -- Create X 1/1 white Vampire creature tokens with lifelink, where X is the number of other attacking creatures.
 mana={3}{G}{G}{W}{W}
 type=Legendary Creature
@@ -43335,7 +43335,7 @@ subtype=Plains Swamp Forest
 [card]
 name=Indoctrination Attendant
 abilities=poisontoxic
-auto=may moveTo(hand) notAtarget(creature|myBattlefield) && _PHYREXIANMITETOKEN_
+auto=may moveTo(hand) notAtarget(other *|myBattlefield) && _PHYREXIANMITETOKEN_
 text=Toxic 1 (Players dealt combat damage by this creature also get a poison counter.) -- When Indoctrination Attendant enters the battlefield, you may return another permanent you control to its owner's hand. If you do, create a 1/1 colorless Phyrexian Mite artifact creature token with toxic 1 and "This creature can't block."
 mana={3}{W}
 type=Creature
@@ -88726,7 +88726,7 @@ toughness=4
 [/card]
 [card]
 name=The Circle of Loyalty
-anyzone=aslongas[knight|myBattlefield) altercost(colorless,-1) >0
+anyzone=aslongas(knight|myBattlefield) altercost(colorless,-1) >0
 anyzone=aslongas(knight|myBattlefield) altercost(colorless,-1) >1
 anyzone=aslongas(knight|myBattlefield) altercost(colorless,-1) >2
 anyzone=aslongas(knight|myBattlefield) altercost(colorless,-1) >3
@@ -91874,7 +91874,7 @@ subtype=Aura
 [/card]
 [card]
 name=Traumatic Revelation
-auto=if type(*[creature;battle]|opponenthand)~morethan~0 then name(Reveal opponent hand) name(Reveal opponent hand) target(*[creature;battle]|opponenthand) moveto(myreveal) and!( transforms((,newability[choice name(Opponent discards) moveto(opponenthand) and!( reject )!],newability[choice name(Opponent doesn't discards) moveto(opponenthand) and!( token(Incubator) and!( counter(1/1.3) )!])) oneshot )!
+auto=if type(*[creature;battle]|opponenthand)~morethan~0 then name(Reveal opponent hand) name(Reveal opponent hand) target(*[creature;battle]|opponenthand) moveto(myreveal) and!( transforms((,newability[choice name(Opponent discards) moveto(opponenthand) and!( reject )!],newability[choice name(Opponent doesn't discards) moveto(opponenthand) and!( token(Incubator) and!( counter(1/1.3) )!])) oneshot )! )!
 auto=if type(*[creature;battle]|opponenthand)~equalto~0 then if type(*|opponenthand)~morethan~0 then name(Reveal opponent hand) name(Reveal opponent hand) name(Reveal opponent hand) target(*|opponenthand) moveto(myreveal) and!( moveto(opponenthand) and!( token(Incubator) and!( counter(1/1.3) )! )! )!
 auto=if type(*|opponenthand)~equalto~0 then name(Incubate 3) name(Incubate 3) token(Incubator) and!( counter(1/1.3) )!
 text=Target opponent reveals their hand. You may choose a creature or battle card from it. If you do, that player discards that card. If you don't, incubate 3. (Create an Incubator token with three +1/+1 counters on it and "{2}: Transform this artifact." It transforms into a 0/0 Phyrexian artifact creature.)
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 590db8083..4f8fb5925 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -53630,6 +53630,7 @@ abilities=flying
 text=Flying
 type=Creature
 subtype=Vampire Berserker
+color=black
 power=3
 toughness=2
 [/card]