diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index 6bdaca5db..75f19b9a5 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -38483,7 +38483,7 @@ toughness=3
 [card]
 name=Floriferous Vinewall
 abilities=defender
-auto=reveal:6 optionone name(Get a land) target(land|reveal) moveto(hand) optiononeend optiontwo name(put on bottom) target(<4>*|reveal) bottomoflibrary optiontwoend revealend
+auto=reveal:6 optionone name(Get a land) target(land|reveal) moveto(hand) optiononeend optiontwo name(put on bottom) all(*|reveal) bottomoflibrary optiontwoend revealend
 text=Defender -- When Floriferous Vinewall enters, look at the top six cards of your library. You may reveal a land card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
 mana={1}{G}
 type=Creature
@@ -41974,7 +41974,7 @@ toughness=2
 [card]
 name=Ghostfire Blade
 auto={3}:equip
-auto={1}:equip target(creature[colorless]|mybattlefield)
+auto={1}:name(equip colorless creature) equip target(creature[colorless]|mybattlefield)
 auto=teach(creature) 2/2
 text=Equipped creature gets +2/+2. -- Equip {3} -- Ghostfire Blade's equip ability costs {2} less to activate if it targets a colorless creature.
 mana={1}
@@ -43974,9 +43974,9 @@ toughness=2
 [/card]
 [card]
 name=Goblin Bowling Team
-auto=@damaged(creature) from(this):all(trigger[to]) rolld6 6 winability damage:lastrollresult winabilityend loseability damage:lastrollresult loseabilityend rolld6end
-auto=@damageof(player) from(this):all(this) rolld6 6 winability damage:lastrollresult controller winabilityend loseability damage:lastrollresult controller loseabilityend rolld6end
-auto=@damagefoeof(player) from(this):all(this) rolld6 6 winability damage:lastrollresult opponent winabilityend loseability damage:lastrollresult opponent loseabilityend rolld6end
+auto=@damaged(creature) from(this) turnLimited:all(trigger[to]) rolld6 6 winability damage:lastrollresult winabilityend loseability damage:lastrollresult loseabilityend rolld6end
+auto=@damageof(player) from(this) turnLimited:all(this) rolld6 6 winability damage:lastrollresult controller winabilityend loseability damage:lastrollresult controller loseabilityend rolld6end
+auto=@damagefoeof(player) from(this) turnLimited:all(this) rolld6 6 winability damage:lastrollresult opponent winabilityend loseability damage:lastrollresult opponent loseabilityend rolld6end
 text=If Goblin Bowling Team would deal damage to a permanent or player, it deals that much damage plus the result of a six-sided die roll to that permanent or player instead.
 mana={3}{R}
 type=Creature
@@ -106835,7 +106835,7 @@ type=Instant
 name=Take Out the Trash
 target=creature,planeswalker
 auto=damage:3
-auto=aslongas(*[raccoon]|myBattlefield) _DISCARD&DRAW_
+auto=aslongas(*[raccoon]|myBattlefield) may _DISCARD&DRAW_
 text=Take Out the Trash deals 3 damage to target creature or planeswalker. If you control a Raccoon, you may discard a card. If you do, draw a card.
 mana={1}{R}
 type=Instant
@@ -112133,7 +112133,7 @@ type=Sorcery
 name=Tolsimir, Friend to Wolves
 auto=@movedto(wolf|myBattlefield):all(trigger[to]) transforms((,newability[may target(creature|opponentbattlefield) dynamicability<!powerstrike eachother!>]))
 auto=@movedto(wolf|myBattlefield):life:3
-auto=token(Voja^ Friend to Elves,legendary wolf creature,3/3,green:white)
+auto=token(Voja Friend to Elves,legendary wolf creature,3/3,green,white)
 text=When Tolsimir, Friend to Wolves enters, create Voja, Friend to Elves, a legendary 3/3 green and white Wolf creature token. -- Whenever a Wolf enters under your control, you gain 3 life and that creature fights up to one target creature an opponent controls.
 mana={2}{G}{G}{W}
 type=Legendary Creature