diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index 612a7f4cd..5a22f9171 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -5921,7 +5921,7 @@ auto=@movedTo(other creature|graveyard) from(myBattlefield):name(Transform Daunt
 text=When another creature you control dies, transform Bereaved Survivor. // Dauntless Avenger
 mana={2}{W}
 type=Creature
-subtype=Human Pesant
+subtype=Human Peasant
 power=2
 toughness=1
 [/card]
@@ -19446,7 +19446,7 @@ type=Sorcery
 [card]
 name=Dowsing Dagger
 auto=token(Plant,creature Plant,0/2,green,defender)*2 opponent
-auto=@combatdamaged(player) from(this):target(Dowsing Dagger) flip(Lost Vale)
+auto=@combatdamaged(player) from(mytgt):all(this) moveto(mybattlefield) and!(flip(Lost Vale))!
 auto=teach(creature) 2/1
 auto={2}:equip
 text=When Dowsing Dagger enters the battlefield, target opponent creates two 0/2 green Plant creature tokens with defender. -- Equipped creature gets +2/+1. -- Whenever equipped creature deals combat damage to a player, you may transform Dowsing Dagger. -- Equip {2}
@@ -22346,7 +22346,7 @@ auto=foreach(*|opponenthand) -1/-1
 auto=@each my upkeep:target(opponent) ability$!name(discard) target(<1>*|myhand) reject !$ targetedplayer
 text=Flying -- Enemy of Enlightenment gets -1/-1 for each card in your opponents' hands. -- At the beginning of your upkeep, each player discards a card.
 mana={5}{B}
-type=Enchatment Creature
+type=Enchantment Creature
 subtype=Demon
 power=5
 toughness=5
@@ -72607,7 +72607,7 @@ toughness=2
 name=Tenth District Legionnaire
 abilities=haste
 aicode=activate transforms((,newability[all(*[zpos<=1]|mylibrary) transforms((,newability[may name(Put on bottom of library) moveto(myreveal) and!( bottomoflibrary )!])) oneshot])) oneshot
-auto=@targeted(this):counter(1/1) && _SCRY_(1)
+auto=_HEROIC_counter(1/1) && _SCRY_(1)
 text=Haste -- Whenever you cast a spell that targets Tenth District Legionnaire, put a +1/+1 counter on Tenth District Legionnaire, then scry 1.
 mana={R}{W}
 type=Creature
@@ -74600,8 +74600,8 @@ name=Timmy, Power Gamer
 auto={4}:moveto(mybattlefield) target(creature|myhand)
 text={4}: Put a creature into play from your hand.
 mana={2}{G}{G}
-type=Summon
-subtype=Legend
+type=Legendary Creature
+subtype=Human Gamer
 [/card]
 [card]
 name=Timothar, Baron of Bats
@@ -81884,8 +81884,8 @@ type=Instant
 [card]
 name=Wintermoor Commander
 abilities=deathtouch
-anyzone=2/type:creature[knight]:battlefield cdaactive
-auto=_ATTACKING_target(creature[knight]) indestructible ueot
+anyzone=2/type:creature[knight]:myBattlefield cdaactive
+auto=_ATTACKING_target(other creature[knight]) indestructible ueot
 text=Deathtouch -- Wintermoor Commander's toughness is equal to the number of Knights you control. -- Whenever Wintermoor Commander attacks, another target Knight you control gains indestructible until end of turn. (Damage and effects that say "destroy" don't destroy it.)
 mana={W}{B}
 type=Creature
@@ -83387,7 +83387,7 @@ type=Enchantment
 [/card]
 [card]
 name=Zurzoth, Chaos Rider
-auto=@drawfoeof(player) restriction{myturnonly} turnlimited:name(Create Devil) token(Devil,Creature Devil,1/1,red) and!( transforms((,newability[@movedto(this|mygraveyard):damage:1 target(player^creature)])) forever )!
+auto=@drawfoeof(player) restriction{myturnonly} turnlimited:name(Create Devil) token(Devil,Creature Devil,1/1,red) and!( transforms((,newability[@movedto(this|mygraveyard):damage:1 target(*[player;creature;planeswalker])])) forever )!
 auto=@combat(attacking) source(creature[devil]|myBattlefield) turnlimited:name(Draw and discard) draw:1 && transforms((,newability[target(*|myhand) reject])) oneshot
 auto=@combat(attacking) source(creature[devil]|myBattlefield) turnlimited:ability$!name(Draw and discard) name(Draw and discard) draw:1 && transforms((,newability[target(*|myhand) reject])) oneshot!$ opponent
 text=Whenever an opponent draws their first card each turn, if it's not their turn, you create a 1/1 red Devil creature token with "When this creature dies, it deals 1 damage to any target." -- Whenever one or more Devils you control attack one or more players, you and those players each draw a card, then discard a card at random.
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index d915b0eeb..8ff030790 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -28124,8 +28124,8 @@ toughness=1
 [/card]
 [card]
 name=Dega Sanctuary
-auto=@each my upkeep restriction{type(*[black]|myBattlefield)~morethan~0,type(*[red]|myBattlefield)~lessthan~1}}:life:2
-auto=@each my upkeep restriction{type(*[red]|myBattlefield)~morethan~0,type(*[black]|myBattlefield)~lessthan~1}}:life:2
+auto=@each my upkeep restriction{type(*[black]|myBattlefield)~morethan~0,type(*[red]|myBattlefield)~lessthan~1}:life:2
+auto=@each my upkeep restriction{type(*[red]|myBattlefield)~morethan~0,type(*[black]|myBattlefield)~lessthan~1}:life:2
 auto=@each my upkeep restriction{type(*[black]|myBattlefield)~morethan~0,type(*[red]|myBattlefield)~morethan~0}:life:4
 text=At the beginning of your upkeep, if you control a black or red permanent, you gain 2 life. If you control a black permanent and a red permanent, you gain 4 life instead.
 mana={2}{W}
@@ -36496,7 +36496,7 @@ name=Ephara's Enlightenment
 target=creature
 auto=counter(1/1,1)
 auto=teach(creature) flying
-auto=@movedto(creature|mybattlefield):may choice moveto(ownerhand) all(this)
+auto=@movedto(creature|mybattlefield):may moveto(ownerHand) all(this)
 text=Enchant creature -- When Ephara's Enlightenment enters the battlefield, put a +1/+1 counter on enchanted creature. -- Enchanted creature has flying. -- Whenever a creature enters the battlefield under your control, you may return Ephara's Enlightenment to its owner's hand.
 mana={1}{W}{U}
 type=Enchantment
@@ -115980,7 +115980,7 @@ toughness=4
 [/card]
 [card]
 name=Suppression Bonds
-target=*[-land]|battlefield
+target=artifact,creature,enchantment,planeswalker
 auto=teach(*) cantattack
 auto=teach(*) cantpwattack
 auto=teach(*) cantblock
@@ -116418,7 +116418,7 @@ subtype=Swamp
 name=Swan Song
 target=enchantment,instant,sorcery|stack
 auto=fizzle
-auto=token(Bird,Creature Bird,2/2,blue,flying) targetcontroller
+auto=token(Bird,Creature Bird,2/2,blue,flying) opponent
 text=Counter target enchantment, instant or sorcery spell. Its controller puts a 2/2 blue Bird creature token with flying onto the battlefield under their control. 
 mana={U}
 type=Instant
diff --git a/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt b/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
index 180c579bb..925ce3cdb 100644
--- a/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
+++ b/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
@@ -870,7 +870,7 @@ subtype=Elspeth
 name=Estrid, the Masked
 abilities=canbecommander
 auto=counter(0/0,3,loyalty)
-auto={C(0/0,2,Loyalty)}:name(+2: Untap each enchanted permanent) untap all(*[geared]|myBattlefield)
+auto={C(0/0,2,Loyalty)}:name(+2: Untap each enchanted permanent) untap all(*[enchanted]|myBattlefield)
 auto={C(0/0,-1,Loyalty)}:name(-1: Create an Aura Mask) token(Mask Est)
 auto={C(0/0,-7,Loyalty)}:name(-7: Mill seven cards and return enchantments) deplete:7 controller && moveTo(myBattlefield) all(enchantment|myGraveyard)
 text=+2: Untap each enchanted permanent you control. -- −1: Create a white Aura enchantment token named Mask attached to another target permanent. The token has enchant permanent and totem armor. -- −7: Mill seven cards. Return all non-Aura enchantment cards from your graveyard to the battlefield, then do the same for Aura cards. -- Estrid, the Masked can be your commander.
@@ -2957,7 +2957,7 @@ subtype=Tibalt
 name=Tibalt, Rakish Instigator
 auto=counter(0/0,5,loyalty)
 abilities=nolifegainopponent
-auto={C(0/0,-2,Loyalty)}:name(-2: Create a 1/1 Devil) token(Devil,Creature Devil,1/1,red) and!( transforms((,newability[@movedto(this|mygraveyard):damage:1 target(player,creature,planeswalker)])) forever )!
+auto={C(0/0,-2,Loyalty)}:name(-2: Create a 1/1 Devil) token(Devil,Creature Devil,1/1,red) and!( transforms((,newability[@movedto(this|mygraveyard):damage:1 target(*[player;creature;planeswalker])])) forever )!
 text=Your opponents can't gain life. -- -2: Create a 1/1 red Devil creature token with "Whenever this creature dies, it deals 1 damage to any target."
 mana={2}{R}
 type=Legendary Planeswalker