diff --git a/projects/mtg/bin/Res/sets/10E/_cards.dat b/projects/mtg/bin/Res/sets/10E/_cards.dat
index 9e5648523..2319a0c6a 100644
--- a/projects/mtg/bin/Res/sets/10E/_cards.dat
+++ b/projects/mtg/bin/Res/sets/10E/_cards.dat
@@ -1103,6 +1103,8 @@ toughness=2
 [/card]
 [card]
 text=At the beginning of your upkeep, you draw X cards and you lose X life, where X is the number of Zombies you control.
+auto=@each my upkeep:foreach(zombie|myinplay) draw:1
+auto=@each my upkeep:foreach(zombie|myinplay) life:-1
 id=135256
 name=Graveborn Muse
 rarity=R
@@ -2663,6 +2665,8 @@ toughness=2
 [/card]
 [card]
 text=Each player loses 1 life for each creature he or she controls.
+auto=foreach(creature|opponentinplay) life:-1 opponent
+auto=foreach(creature|myinplay) life:-1 controller
 id=135197
 name=Stronghold Discipline
 rarity=U
diff --git a/projects/mtg/bin/Res/sets/CFX/_cards.dat b/projects/mtg/bin/Res/sets/CFX/_cards.dat
index 94494a16d..1709eb5e4 100644
--- a/projects/mtg/bin/Res/sets/CFX/_cards.dat
+++ b/projects/mtg/bin/Res/sets/CFX/_cards.dat
@@ -124,7 +124,7 @@ mana={U}
 subtype=Aura
 [/card]
 [card]
-text=Enchant Forest or Plains     Whenever enchanted land becomes tapped, its controller loses 2 life.
+text=Enchant Forest or Plains. Whenever enchanted land becomes tapped, its controller loses 2 life.
 id=183054
 target=forest,plains
 alias=1218
diff --git a/projects/mtg/bin/Res/sets/EVE/_cards.dat b/projects/mtg/bin/Res/sets/EVE/_cards.dat
index bff681cf3..ec294a70f 100644
--- a/projects/mtg/bin/Res/sets/EVE/_cards.dat
+++ b/projects/mtg/bin/Res/sets/EVE/_cards.dat
@@ -402,7 +402,7 @@ subtype=Spirit
 toughness=2
 [/card]
 [card]
-text=Defender, flying     Whenever you play a white spell, Loyal Gyrfalcon loses defender until end of turn.
+text=Defender, flying. Whenever you play a white spell, Loyal Gyrfalcon loses defender until end of turn.
 abilities=defender,flying
 auto=@movedTo(*[white]|mystack):-defender
 id=151059
diff --git a/projects/mtg/bin/Res/sets/LEG/_cards.dat b/projects/mtg/bin/Res/sets/LEG/_cards.dat
index a908f4448..3152abbbd 100644
--- a/projects/mtg/bin/Res/sets/LEG/_cards.dat
+++ b/projects/mtg/bin/Res/sets/LEG/_cards.dat
@@ -519,7 +519,7 @@ mana={2}{W}
 type=Enchantment
 [/card]
 [card]
-text=Legendary     {T}: Add {R} to your mana pool.      {T}: Target creature loses all landwalk abilities until end of turn.
+text=Legendary. {T}: Add {R} to your mana pool. {T}: Target creature loses all landwalk abilities until end of turn.
 auto={T}:Add {R}
 auto={T}:-plainswalk && -islandwalk && -swampwalk && -mountainwalk && -forestwalk target(creature)
 id=1700
@@ -1315,7 +1315,7 @@ toughness=4
 abilities=legendary
 [/card]
 [card]
-text=Legendary     {T}: Add {U} to your mana pool.      {T}: Target Target creature loses banding and all "bands with other" abilities until end of turn. Play this ability only during any upkeep step.
+text=Legendary. {T}: Add {U} to your mana pool. {T}: Target Target creature loses banding and all "bands with other" abilities until end of turn. Play this ability only during any upkeep step.
 auto={T}: Add {U}
 auto={T}:-banding target(creature)
 id=1705
@@ -1390,7 +1390,7 @@ mana={2}{U}
 type=Enchantment
 [/card]
 [card]
-text=Legendary     {T}: Add {B} to your mana pool.      {T}: Target creature loses first strike or swampwalk until end of turn.
+text=Legendary. {T}: Add {B} to your mana pool. {T}: Target creature loses first strike or swampwalk until end of turn.
 auto={T}: Add {B}
 auto={T}:-swampwalk target(creature)
 auto={T}:-first strike target(creature)
diff --git a/projects/mtg/bin/Res/sets/MRD/_cards.dat b/projects/mtg/bin/Res/sets/MRD/_cards.dat
index d8f9a6ab1..767791500 100644
--- a/projects/mtg/bin/Res/sets/MRD/_cards.dat
+++ b/projects/mtg/bin/Res/sets/MRD/_cards.dat
@@ -226,7 +226,7 @@ type=Artifact
 mana={3}
 [/card]
 [card]
-text=Protection from white At the end of your turn, you lose 4 life. Whenever a creature is put into a graveyard from play, you gain 2 life.
+text=Protection from white. At the end of your turn, you lose 4 life. Whenever a creature is put into a graveyard from play, you gain 2 life.
 abilities=protection from white
 auto=@movedTo(creature|graveyard) from(battlefield):life:2
 auto=@each my end:life:-4
diff --git a/projects/mtg/bin/Res/sets/MRQ/_cards.dat b/projects/mtg/bin/Res/sets/MRQ/_cards.dat
index 46624540b..c7439ff95 100644
--- a/projects/mtg/bin/Res/sets/MRQ/_cards.dat
+++ b/projects/mtg/bin/Res/sets/MRQ/_cards.dat
@@ -574,8 +574,7 @@ type=Land
 [card]
 text=When Highway Robber comes into play, target opponent loses 2 life and you gain 2 life.
 id=19585
-target=player
-auto=damage:2
+auto=life:-2 opponent
 auto=life:2 controller
 name=Highway Robber
 color=Black
diff --git a/projects/mtg/bin/Res/sets/ONS/_cards.dat b/projects/mtg/bin/Res/sets/ONS/_cards.dat
index 6a6013279..3361d7dd5 100644
--- a/projects/mtg/bin/Res/sets/ONS/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ONS/_cards.dat
@@ -818,7 +818,7 @@ subtype=Zombie Cleric
 power=1
 toughness=1
 text={T}: Each player loses 1 life for each Zombie in play.
-auto=foreach(Zombie) damage:1 all(player)
+auto=foreach(Zombie) life:-1 all(player)
 rarity=C
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/sets/POR/_cards.dat b/projects/mtg/bin/Res/sets/POR/_cards.dat
index 388f64224..e65f9d693 100644
--- a/projects/mtg/bin/Res/sets/POR/_cards.dat
+++ b/projects/mtg/bin/Res/sets/POR/_cards.dat
@@ -319,6 +319,17 @@ subtype=Human Knight
 toughness=2
 [/card]
 [card]
+text=Search your library for a card, then shuffle your library and put that card on top of it. You lose 2 life.
+target=*|mylibrary
+auto=moveTo(mylibrary)
+auto=life:-2 controller
+id=4215
+name=Cruel Tutor
+rarity=R
+type=Sorcery
+mana={2}{B}
+[/card]
+[card]
 text=Deep-Sea Serpent can't attack unless defending player controls an Island.
 abilities=cantattack
 auto=aslongas(island|opponentinplay) -cantattack
@@ -396,7 +407,7 @@ toughness=6
 abilities=flying
 [/card]
 [card]
-text=Flying       When Dread Reaper comes into play, you lose 5 life.
+text=Flying. When Dread Reaper comes into play, you lose 5 life.
 auto=life:-5
 id=4217
 name=Dread Reaper
diff --git a/projects/mtg/bin/Res/sets/POR/todo.dat b/projects/mtg/bin/Res/sets/POR/todo.dat
index 7bd55c51c..d754a5adb 100644
--- a/projects/mtg/bin/Res/sets/POR/todo.dat
+++ b/projects/mtg/bin/Res/sets/POR/todo.dat
@@ -95,14 +95,6 @@ type=Sorcery
 mana={4}{U}
 [/card]
 [card]
-text=Search your library for a card, then shuffle your library and put that card on top of it. You lose 2 life.
-id=4215
-name=Cruel Tutor
-rarity=R
-type=Sorcery
-mana={2}{B}
-[/card]
-[card]
 text=Play Deep Wood only during the declare attackers step and only if you are the defending player.     Prevent all damage that would be dealt to you this turn by attacking creatures.
 id=4292
 name=Deep Wood
diff --git a/projects/mtg/bin/Res/sets/RAV/_cards.dat b/projects/mtg/bin/Res/sets/RAV/_cards.dat
index d939c8bcd..1a8ccdf27 100644
--- a/projects/mtg/bin/Res/sets/RAV/_cards.dat
+++ b/projects/mtg/bin/Res/sets/RAV/_cards.dat
@@ -386,7 +386,7 @@ abilities=mountainwalk
 [card]
 text={B}, Sacrifice a creature: Target player loses 1 life.
 id=89038
-auto={B}{S(creature|myinplay)}:damage:1 target(player)
+auto={B}{S(creature|myinplay)}:life:-1 opponent
 name=Golgari Rotwurm
 rarity=C
 type=Creature
@@ -517,8 +517,8 @@ mana={W}{R}
 type=Instant
 [/card]
 [card]
-text=Flying       At the beginning of your upkeep, you lose 1 life.
-alias=1221
+text=Flying. At the beginning of your upkeep, you lose 1 life.
+auto=@each my upkeep:life:-1
 id=83631
 name=Moroii
 color=Black,Blue
@@ -923,11 +923,11 @@ rarity=C
 mana={3}{U}{U}
 type=Creature
 subtype=Elemental
-{4}:-defender
-{T}:untap target(*)
+auto={4}:-defender
+auto={T}:untap target(*)
 power=4
 toughness=4
-auto=defender
+abilities=defender
 [/card]
 [card]
 text=Legendary     Other green creatures you control get +1/+1.    Other white creatures you control get +1/+1.     {T}: Put a legendary 2/2 green and white Wolf creature token named Voja into play.
diff --git a/projects/mtg/bin/Res/sets/RV/_cards.dat b/projects/mtg/bin/Res/sets/RV/_cards.dat
index b82922867..a3b631cd5 100644
--- a/projects/mtg/bin/Res/sets/RV/_cards.dat
+++ b/projects/mtg/bin/Res/sets/RV/_cards.dat
@@ -1918,7 +1918,8 @@ subtype=Troll
 toughness=2
 [/card]
 [card]
-text=Flying       At the beginning of your upkeep, Serendib Efreet deals 1 damage to you.
+text=Flying. At the beginning of your upkeep, Serendib Efreet deals 1 damage to you.
+auto=@each my upkeep:life:-1
 abilities=Flying
 id=1221
 name=Serendib Efreet
diff --git a/projects/mtg/bin/Res/sets/SHM/_cards.dat b/projects/mtg/bin/Res/sets/SHM/_cards.dat
index 7efc3d2c3..d601a308e 100644
--- a/projects/mtg/bin/Res/sets/SHM/_cards.dat
+++ b/projects/mtg/bin/Res/sets/SHM/_cards.dat
@@ -874,7 +874,7 @@ mana={1}{R}
 [card]
 text={B}{R}: Each player loses 1 life.
 id=157880
-auto={B}{R}:damage:1 all(player)
+auto={B}{R}:life:-1 all(player)
 name=Spiteflame Witch
 rarity=U
 type=Creature
diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp
index 0e571d00d..0055aa80a 100644
--- a/projects/mtg/src/MTGAbility.cpp
+++ b/projects/mtg/src/MTGAbility.cpp
@@ -1272,12 +1272,7 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){
       game->addObserver(NEW APsychicVenom(_id, card, card->target));
       break;
     }
-  case 1221: //Serendib Efreet
-    {
-      game->addObserver( NEW ASerendibEfreet(_id, card));
-      break;
-    }
-  case 1226: //Steal Artifact
+   case 1226: //Steal Artifact
     {
       game->addObserver( NEW AControlStealAura(_id, card, card->target));
       break;
@@ -1735,21 +1730,7 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){
 			game->addObserver(NEW UntapBlocker(_id,card,card->target));
       break;
     }
-
-	  case 135197: //Stronghold Discipline
-    {
-		GameObserver * game = GameObserver::GetInstance();
-      for (int i = 0; i < 2 ; i++){
-		for (int j = 0; j < game->players[i]->game->inPlay->nb_cards; j++){
-			MTGCardInstance * current =  game->players[i]->game->inPlay->cards[j];
-			if (current->hasType("Creature")){
-				current->controller()->life-= 1;
-			}
-		}
-	  }
-      break;
-	}
-
+	
 	case 130369: // Soulblast
     {
 	    int damage = 0;