diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index 1a6334dd3..f7dc87a45 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -5534,7 +5534,8 @@ subtype=Arcane
 [/card]
 [card]
 name=Barrier Breach
-target=<upto:3> enchantment
+abilities=cycling
+target=<upto:3>enchantment
 auto=moveTo(exile)
 autohand=__CLYCLING__({2})
 text=Exile up to three target enchantments. -- Cycling {2} ({2}, Discard this card: Draw a card.)
@@ -14798,7 +14799,7 @@ type=Instant
 [card]
 name=Component Collector
 auto=if type(*[day;night]|battlefield)~equalto~0 then name(It becomes day) activate castcard(noevent named!:Day:!)
-auto=@transformed(*[day;night]|battlefield):may name(Tap or untap permanent) transforms((,newability[target(*[-land]|battlefield) tap],newability[target*[-land]|battlefield) untap])) oneshot
+auto=@transformed(*[day;night]|battlefield):may name(Tap or untap permanent) ability$!choice tap target(*[-land]) _ choice untap target(*)!$ controller])) oneshot
 text=If it's neither day nor night, it becomes day as Component Collector enters the battlefield. -- Whenever day becomes night or night becomes day, you may tap or untap target nonland permanent.
 type=Creature
 subtype=Homunculus
@@ -26176,6 +26177,7 @@ toughness=1
 [card]
 name=Fang of the Pack
 auto=_ATTACKING_1/1 ueot
+auto=@each my combatbegins:target(other creature|myBattlefield) transforms((,newability[@combat(attacking) source(this):1/1 ueot])) ueot
 text=Melee (Whenever this creature attacks, it gets +1/+1 until end of turn for each opponent you attacked with a creature this combat.) -- At the beginning of combat on your turn, another target creature you control gains melee until end of turn. (If a creature has multiple instances of melee, each triggers separately.)
 mana={5}{G}
 type=Creature
@@ -30581,7 +30583,8 @@ toughness=4
 [card]
 name=Gerrard, Weatherlight Hero
 abilities=first strike
-auto=_DIES_moveto(exile) && moveTo(myBattlefield) all(creature[fresh]|graveyard) && moveTo(myBattlefield) all(artifact[fresh]|graveyard)
+auto=_DIES_moveTo(battlefield) all(creature[fresh]|mygraveyard) && moveTo(battlefield) all(artifact[fresh]|mygraveyard)
+autograveyard=_DIES_moveto(exile)
 text=First strike -- When Gerrard, Weatherlight Hero dies, exile it and return to the battlefield all artifact and creature cards in your graveyard that were put there from the battlefield this turn.
 mana={2}{R}{W}
 type=Legendary Creature
@@ -32438,7 +32441,7 @@ toughness=2
 [card]
 name=Goblin Snowman
 auto=@combat(blocking) source(this):preventAllCombatDamage to(this) && preventAllCombatDamage from(this)
-auto={T}:name(Deal 1 damage) damage:1 target(creature[blocking]|battlefield)
+auto={T}:name(Deal 1 damage) damage:1 target(creature[blocked]|opponentBattlefield)
 text=Whenever Goblin Snowman blocks, prevent all combat damage that would be dealt to and dealt by it this turn. -- {T}: Goblin Snowman deals 1 damage to target creature it's blocking.
 mana={3}{R}
 type=Creature
@@ -55478,7 +55481,7 @@ type=Sorcery
 name=Outpost Siege
 auto=choice name(Khans) transforms((,newability[counter(0/0.1.Khans)])) forever
 auto=choice name(Dragons) transforms((,newability[counter(0/0.1.Dragons)])) forever
-auto=@each my upkeep:this(counter{0/0.1.Khans}>=1) name(Reveal top card) reveal:1 optionone may activate castcard(restricted) target(*|reveal) optiononeend optiontwo name(Put Back On Top) target(<1>*|reveal) moveto(mylibrary) optiontwoend revealend])) forever
+auto=@each my upkeep:this(counter{0/0.1.Khans}>=1) __PLAY_TOP_FROM_EXILE__
 auto=@movedto(creature|nonbattlezone) from(mybattlefield):this(counter{0/0.1.Dragons}>=1) damage:1 target(player,creature,planeswalker)
 text=As Outpost Siege enters the battlefield, choose Khans or Dragons. -- Khans -- At the beginning of your upkeep, exile the top card of your library. Until end of turn, you may play that card. -- Dragons -- Whenever a creature you control leaves the battlefield, Outpost Siege deals 1 damage to any target.
 mana={3}{R}
@@ -59291,9 +59294,8 @@ toughness=4
 [/card]
 [card]
 name=Prowling Pangolin
-auto=choice name(Opponent sacrifice 2 creatures and you sacrifice Pangolin) sacrifice && ability$!name(Sacrifice 2 creatures) target(<2>creature|mybattlefield) sacrifice!$ opponent
-auto=choice name(You sacrifices 2 creatures and Pangolin) sacrifice && ability$!name(Sacrifice 2 creatures) target(<2>creature|mybattlefield) sacrifice!$ controller
-auto=choice name(No one sacrifices creatures) donothing
+auto=ability$!name(Choose one) choice notatarget(<2>creature|mybattlefield) sacrifice && sacrifice all(Prowling Pangolin[fresh]|opponentbattlefield) _ choice donothing!$ opponent
+auto=ability$!name(Choose one) choice notatarget(<2>creature|mybattlefield) sacrifice && sacrifice all(Prowling Pangolin[fresh]|mybattlefield) _ choice donothing!$ controller
 text=When Prowling Pangolin enters the battlefield, any player may sacrifice two creatures. If a player does, sacrifice Prowling Pangolin.
 mana={3}{B}{B}
 type=Creature
@@ -65785,7 +65787,7 @@ toughness=4
 [/card]
 [card]
 name=Salvager of Ruin
-auto={S}:target(*[-instant,-sorcery,fresh]|mygraveyard) moveto(myhand)
+auto={S}:target(*[-instant;-sorcery;fresh]|mygraveyard) moveto(myhand)
 text=Sacrifice Salvager of Ruin: Choose target permanent card in your graveyard that was put there from the battlefield this turn. Return it to your hand.
 mana={3}
 type=Artifact Creature
@@ -77817,7 +77819,7 @@ name=Take Flight
 target=creature
 auto=teach(creature) +1/+0
 auto=teach(creature) flying
-auto=teach(creature) _ATTACKING_draw:1
+auto=teach(creature) transforms((,newability[@combat(attacking) source(this):draw:1 controller]))
 text=Enchant creature -- Enchanted creature gets +1/+0 and has flying and "Whenever this creature attacks, draw a card."
 mana={3}{U}
 type=Enchantment
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 5cb57c5ac..e05202f2e 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -89729,7 +89729,7 @@ type=Instant
 [/card]
 [card]
 name=Puncturing Light
-target=creature[attacking;blocking;power<4]
+target=creature[attacking;blocking;power<=3]
 auto=destroy
 text=Destroy target attacking or blocking creature with power 3 or less.
 mana={1}{W}
@@ -100699,7 +100699,8 @@ toughness=2
 [/card]
 [card]
 name=Screeching Buzzard
-auto=@movedto(mygraveyard) from(this|mybattlefield):ability$!name(discard) target(*|myhand) reject!$ opponent
+abilities=flying
+auto=_DIES_ability$!name(discard) target(*|myhand) reject!$ opponent
 text=Flying -- When Screeching Buzzard dies, each opponent discards a card.
 mana={3}{B}
 type=Creature