diff --git a/src/magic/card/Flight_of_Fancy.java b/src/magic/card/Flight_of_Fancy.java
index 2b1262d74c..16e8753692 100644
--- a/src/magic/card/Flight_of_Fancy.java
+++ b/src/magic/card/Flight_of_Fancy.java
@@ -12,10 +12,10 @@ public class Flight_of_Fancy {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent, final MagicPlayer player) {
             return new MagicEvent(
-                    permanent,
-                    player,
-                    this,
-                    player + " draws two cards.");
+                permanent,
+                this,
+                "PN draws two cards."
+            );
         }
         @Override
         public void executeEvent(
diff --git a/src/magic/card/Jayemdae_Tome.java b/src/magic/card/Jayemdae_Tome.java
index 042c1a2936..d79a88c452 100644
--- a/src/magic/card/Jayemdae_Tome.java
+++ b/src/magic/card/Jayemdae_Tome.java
@@ -22,10 +22,12 @@ public class Jayemdae_Tome {
 
         @Override
         public MagicEvent[] getCostEvent(final MagicSource source) {
-            return new MagicEvent[] { new MagicPayManaCostTapEvent(
-                            source,
-                            source.getController(),
-                            MagicManaCost.FOUR)
+            return new MagicEvent[] {
+                new MagicPayManaCostTapEvent(
+                    source,
+                    source.getController(),
+                    MagicManaCost.FOUR
+                )
             };
         }
 
@@ -33,12 +35,10 @@ public class Jayemdae_Tome {
         public MagicEvent getPermanentEvent(
                 final MagicPermanent source,
                 final MagicPayedCost payedCost) {
-            final MagicPlayer player = source.getController();
             return new MagicEvent(
                     source,
-                    player,
                     this,
-                    player + " draws a card.");
+                    "PN draws a card.");
         }
 
         @Override
diff --git a/src/magic/card/Maalfeld_Twins.java b/src/magic/card/Maalfeld_Twins.java
index c6a01ddc21..9d53c6903a 100644
--- a/src/magic/card/Maalfeld_Twins.java
+++ b/src/magic/card/Maalfeld_Twins.java
@@ -17,13 +17,11 @@ public class Maalfeld_Twins {
                 final MagicGame game,
                 final MagicPermanent permanent,
                 final MagicGraveyardTriggerData triggerData) {
-            final MagicPlayer player = permanent.getController();
             return (MagicLocationType.Play == triggerData.fromLocation) ?
                 new MagicEvent(
                     permanent,
-                    player,
                     this,
-                    player + " puts two 2/2 black Zombie " +
+                    "PN puts two 2/2 black Zombie " +
                     "creature tokens onto the battlefield.") :
                 MagicEvent.NONE;
         }
diff --git a/src/magic/card/Mask_of_Riddles.java b/src/magic/card/Mask_of_Riddles.java
index e2f725d42a..0c0df1a854 100644
--- a/src/magic/card/Mask_of_Riddles.java
+++ b/src/magic/card/Mask_of_Riddles.java
@@ -17,21 +17,19 @@ public class Mask_of_Riddles {
                 final MagicGame game,
                 final MagicPermanent permanent,
                 final MagicDamage damage) {
-            final MagicPlayer player = permanent.getController();
             return (permanent.getEquippedCreature() == damage.getSource() &&
                     damage.getTarget().isPlayer() &&
                     damage.isCombat()) ?
-                    new MagicEvent(
-                            permanent,
-                            player,
-                            new MagicSimpleMayChoice(
-                                    player + " may draw a card.",
-                                    MagicSimpleMayChoice.DRAW_CARDS,
-                                    1,
-                                    MagicSimpleMayChoice.DEFAULT_NONE),
-                            this,
-                            player + " may$ draw a card.") :
-                    MagicEvent.NONE;
+                new MagicEvent(
+                    permanent,
+                    new MagicSimpleMayChoice(
+                        MagicSimpleMayChoice.DRAW_CARDS,
+                        1,
+                        MagicSimpleMayChoice.DEFAULT_NONE),
+                    this,
+                    "PN may$ draw a card."
+                ) :
+                MagicEvent.NONE;
         }
 
         @Override
diff --git a/src/magic/card/Myrsmith.java b/src/magic/card/Myrsmith.java
index 6ea6e5b4d6..98855f7463 100644
--- a/src/magic/card/Myrsmith.java
+++ b/src/magic/card/Myrsmith.java
@@ -16,20 +16,18 @@ import magic.model.trigger.MagicWhenOtherSpellIsCastTrigger;
 public class Myrsmith {
     public static final MagicWhenOtherSpellIsCastTrigger T = new MagicWhenOtherSpellIsCastTrigger() {
         @Override
-        public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicCardOnStack data) {
-            final MagicPlayer player = permanent.getController();
-            final MagicCard card = data.getCard();
-            return (card.getOwner() == player &&
-                    data.getCardDefinition().isArtifact()) ?
+        public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicCardOnStack spell) {
+            return (permanent.isFriend(spell) &&
+                    spell.getCardDefinition().isArtifact()) ?
                 new MagicEvent(
-                        permanent,
-                        player,
-                        new MagicMayChoice(
-                                "You may pay {1}.",
-                                new MagicPayManaCostChoice(MagicManaCost.ONE)),
-                        this,
-                        player + " may$ pay {1}$. If you do, put a 1/1 " +
-                        "colorless Myr artifact creature token onto the battlefield."):
+                    permanent,
+                    new MagicMayChoice(
+                        new MagicPayManaCostChoice(MagicManaCost.ONE)
+                    ),
+                    this,
+                    "PN may$ pay {1}$. If you do, put a 1/1 " +
+                    "colorless Myr artifact creature token onto the battlefield."
+                ) :
                 MagicEvent.NONE;
         }
         
diff --git a/src/magic/card/Nagao__Bound_by_Honor.java b/src/magic/card/Nagao__Bound_by_Honor.java
index 0eda05a613..67d4751ce6 100644
--- a/src/magic/card/Nagao__Bound_by_Honor.java
+++ b/src/magic/card/Nagao__Bound_by_Honor.java
@@ -15,14 +15,12 @@ public class Nagao__Bound_by_Honor {
     public static final MagicWhenAttacksTrigger T3 = new MagicWhenAttacksTrigger() {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPermanent creature) {
-            final MagicPlayer player = creature.getController();
             return (permanent == creature) ?
                 new MagicEvent(
-                        permanent,
-                        player,
-                        this,
-                        "Samurai creatures " + player +
-                        " controls get +1/+1 until end of turn.") :
+                    permanent,
+                    this,
+                    "Samurai creatures PN controls get +1/+1 until end of turn."
+                ) :
                 MagicEvent.NONE;
         }
         
diff --git a/src/magic/card/Soul_Link.java b/src/magic/card/Soul_Link.java
index efae4cc261..d028ea8dbf 100644
--- a/src/magic/card/Soul_Link.java
+++ b/src/magic/card/Soul_Link.java
@@ -13,15 +13,13 @@ public class Soul_Link {
     public static final MagicWhenDamageIsDealtTrigger T1 = new MagicWhenDamageIsDealtTrigger() {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicDamage damage) {
-            final MagicPlayer player=permanent.getController();
             final int amount=damage.getDealtAmount();
             return (damage.getSource()==permanent.getEnchantedCreature()) ?
                 new MagicEvent(
                         permanent,
-                        player,
                         new Object[]{amount},
                         this,
-                        player + " gains " + amount + " life.") :
+                        "PN gains " + amount + " life.") :
                 MagicEvent.NONE;
         }
         @Override
@@ -38,15 +36,13 @@ public class Soul_Link {
     public static final MagicWhenDamageIsDealtTrigger T2 = new MagicWhenDamageIsDealtTrigger() {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicDamage damage) {
-            final MagicPlayer player=permanent.getController();
             final int amount=damage.getDealtAmount();
             return (damage.getTarget()==permanent.getEnchantedCreature()) ?
                 new MagicEvent(
                     permanent,
-                    player,
                     new Object[]{amount},
                     this,
-                    player + " gains " + amount + " life.") :
+                    "PN gains " + amount + " life.") :
                 MagicEvent.NONE;
         }
         @Override
diff --git a/src/magic/card/Urza_s_Blueprints.java b/src/magic/card/Urza_s_Blueprints.java
index ec5144e290..36ccfc6580 100644
--- a/src/magic/card/Urza_s_Blueprints.java
+++ b/src/magic/card/Urza_s_Blueprints.java
@@ -28,12 +28,10 @@ public class Urza_s_Blueprints {
         public MagicEvent getPermanentEvent(
                 final MagicPermanent source,
                 final MagicPayedCost payedCost) {
-            final MagicPlayer player = source.getController();
             return new MagicEvent(
                     source,
-                    player,
                     this,
-                    player + " draws a card.");
+                    "PN draws a card.");
         }
 
         @Override