diff --git a/projects/mtg/bin/Res/sets/GPT/_cards.dat b/projects/mtg/bin/Res/sets/GPT/_cards.dat
index 445b85665..cce533904 100644
--- a/projects/mtg/bin/Res/sets/GPT/_cards.dat
+++ b/projects/mtg/bin/Res/sets/GPT/_cards.dat
@@ -365,7 +365,8 @@ rarity=R
 mana={1}{R}{G}{G}
 type=Creature
 subtype=Elemental
-auto=@each my upkeep:damage:1 all(player)
+auto=@each my upkeep:damage:1 opponent
+auto=@each my upkeep:damage:1 controller
 power=5
 toughness=5
 [/card]
diff --git a/projects/mtg/bin/Res/sets/INV/_cards.dat b/projects/mtg/bin/Res/sets/INV/_cards.dat
index 72332a697..193eabaff 100644
--- a/projects/mtg/bin/Res/sets/INV/_cards.dat
+++ b/projects/mtg/bin/Res/sets/INV/_cards.dat
@@ -226,9 +226,11 @@ rarity=U
 mana={1}{R}
 kicker={2}
 auto=damage:1 all(creature[-flying])
-auto=damage:1 all(player)
+auto=damage:1 opponent
+auto=damage:1 controller
 auto=kicker damage:3 all(creature[-flying])
-auto=kicker damage:3 all(player)
+auto=kicker damage:3 opponent
+auto=kicker damage:3 controller
 type=Sorcery
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/sets/NMS/_cards.dat b/projects/mtg/bin/Res/sets/NMS/_cards.dat
index ba813caa9..edc4c3874 100644
--- a/projects/mtg/bin/Res/sets/NMS/_cards.dat
+++ b/projects/mtg/bin/Res/sets/NMS/_cards.dat
@@ -19,7 +19,7 @@ toughness=3
 text=Flying (This creature can't be blocked except by creatures with flying or reach.) Other black creatures get +1/+1.  Nonblack creatures get -1/-1.
 abilities=legendary,flying
 auto=lord(creature[black]) 1/1 other
-auto=lord(creature[-black]) 1/1
+auto=lord(creature[-black]) -1/-1
 rarity=R
 [/card]
 [card]
@@ -53,7 +53,8 @@ name=Flame Rift
 mana={1}{R}
 type=Sorcery
 text=Flame Rift deals 4 damage to each player.
-auto=damage:4 all(player)
+auto=damage:4 opponent
+auto=damage:4 controller
 rarity=C
 [/card]
 [card]
@@ -168,7 +169,7 @@ subtype=Human Mercenary
 power=2
 toughness=2
 text={3}, {T}: Search your library for a Goblin permanent card and put that card onto the battlefield. Then shuffle your library.
-auto={3}{T}:moveTo(myinplay) target(Goblin|mylibrary)
+auto={3}{T}:moveTo(myinplay) target(Goblin[-instant;-sorcery]|mylibrary)
 rarity=R
 [/card]
 [card]
@@ -221,10 +222,11 @@ rarity=R
 [card]
 id=21402
 name=Rath's Edge
-type=Legendary Land
+type=Land
 text={T}: Add {1} to your mana pool.  {4}, {T}, Sacrifice a land: Rath's Edge deals 1 damage to target creature or player.
 auto={T}:Add {1}
 auto={4}{T}{S(land|myinplay)}:damage:1 target(creature,player)
+abilities=legendary
 rarity=R
 [/card]
 [card]
@@ -248,7 +250,7 @@ subtype=Human Mercenary
 power=2
 toughness=2
 text={3}, {T}: Search your library for a Merfolk permanent card and put that card onto the battlefield. Then shuffle your library.
-auto={3}{T}:moveTo(myinplay) target(Merfolk|mylibrary)
+auto={3}{T}:moveTo(myinplay) target(Merfolk[-sorcery;-instant]|mylibrary)
 rarity=R
 [/card]
 [card]
@@ -318,7 +320,7 @@ subtype=Human Rebel
 power=2
 toughness=2
 text={3}, {T}: Search your library for an Elf permanent card and put that card onto the battlefield. Then shuffle your library.
-auto={3}{T}:moveTo(myinplay) target(elf|mylibrary)
+auto={3}{T}:moveTo(myinplay) target(elf[-sorcery;-instant]|mylibrary)
 rarity=R
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/sets/SHM/_cards.dat b/projects/mtg/bin/Res/sets/SHM/_cards.dat
index 4b52585b7..954615872 100644
--- a/projects/mtg/bin/Res/sets/SHM/_cards.dat
+++ b/projects/mtg/bin/Res/sets/SHM/_cards.dat
@@ -1176,7 +1176,7 @@ rarity=U
 mana={1}{BR}
 type=Creature
 subtype=Elemental Shaman
-auto={B}{R}:life:-1 all(player)
+auto={B}{R}:life:-1 opponent && life:-1 player
 power=2
 toughness=1
 [/card]