diff --git a/Mage/src/mage/abilities/keyword/HauntAbility.java b/Mage/src/mage/abilities/keyword/HauntAbility.java
index f57526fcb1e..e21b8459029 100644
--- a/Mage/src/mage/abilities/keyword/HauntAbility.java
+++ b/Mage/src/mage/abilities/keyword/HauntAbility.java
@@ -176,13 +176,13 @@ class HauntEffect extends OneShotEffect {
             Permanent hauntedCreature = game.getPermanent(targetPointer.getFirst(game, source));
             // haunting card will only be moved to exile, if 
             if (hauntedCreature != null) {
-                if (card.moveToExile(source.getSourceId(), "Haunting", id, game)) {
+                if (card.moveToExile(source.getSourceId(), "Haunting", source.getSourceId(), game)) {
                     // remember the haunted creature
                     String key = new StringBuilder("Haunting_").append(source.getSourceId().toString()).append("_").append(card.getZoneChangeCounter()).toString();
                     game.getState().setValue(key, new FixedTarget(targetPointer.getFirst(game, source)));
-                    card.addInfo("001", new StringBuilder("Haunting ").append(hauntedCreature.getName()).toString());
-                    hauntedCreature.addInfo("001", new StringBuilder("Haunted by ").append(card.getName()).toString());
-                    game.informPlayers(new StringBuilder(card.getName()).append(" haunting ").append(hauntedCreature.getName()).toString());
+                    card.addInfo("hauntinfo", new StringBuilder("Haunting ").append(hauntedCreature.getLogName()).toString());
+                    hauntedCreature.addInfo("hauntinfo", new StringBuilder("Haunted by ").append(card.getLogName()).toString());
+                    game.informPlayers(new StringBuilder(card.getName()).append(" haunting ").append(hauntedCreature.getLogName()).toString());
                 }
                 return true;
             }
diff --git a/Mage/src/mage/players/PlayerImpl.java b/Mage/src/mage/players/PlayerImpl.java
index e4c6d01ec2d..716ef90b048 100644
--- a/Mage/src/mage/players/PlayerImpl.java
+++ b/Mage/src/mage/players/PlayerImpl.java
@@ -145,7 +145,7 @@ public abstract class PlayerImpl implements Player, Serializable {
     protected int maxHandSize = 7;
     protected int maxAttackedBy = Integer.MAX_VALUE;
     protected ManaPool manaPool;
-    protected boolean passed;
+    protected boolean passed; // player passed priority
     protected boolean passedTurn;
     protected int turns;
     protected int storedBookmark = -1;