diff --git a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
index ecc476e085..0a500b4440 100644
--- a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
+++ b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
@@ -315,29 +315,18 @@ public class HumanPlayer extends PlayerImpl {
             game.fireSelectTargetEvent(playerId, target.getMessage(), possibleTargets, required, getOptions(target, null));
             waitForResponse(game);
             if (response.getUUID() != null) {
+                if (target.getTargets().contains(response.getUUID())) {
+                    target.remove(response.getUUID());
+                    continue;
+                }
                 if (possibleTargets.contains(response.getUUID())) {
-                    if (target instanceof TargetPermanent) {
-                        if (((TargetPermanent)target).canTarget(playerId, response.getUUID(), source, game)) {
-                            if (target.getTargets().contains(response.getUUID())) { // if already included remove it with
-                                target.remove(response.getUUID());
-                            } else {
-                                target.addTarget(response.getUUID(), source, game);
-                                if(target.doneChosing()){
-                                    return true;
-                                }
-                            }
-                        }
-                    } else if (target.canTarget(playerId, response.getUUID(), source, game)) {
-                        if (target.getTargets().contains(response.getUUID())) { // if already included remove it with 
-                            target.remove(response.getUUID());
-                        } else {
-                            target.addTarget(response.getUUID(), source, game);
-                        }
+                    if (target.canTarget(playerId, response.getUUID(), source, game)) {
+                        target.addTarget(response.getUUID(), source, game);
                         if(target.doneChosing()){
                             return true;
                         }
                     }
-                } // else do nothing - allow to pick another target
+                } 
             } else {
                 if (target.getTargets().size() >= target.getNumberOfTargets()) {
                     return true;
diff --git a/Mage/src/mage/abilities/effects/common/ReturnFromExileEffect.java b/Mage/src/mage/abilities/effects/common/ReturnFromExileEffect.java
index 8cade71f3e..035d000559 100644
--- a/Mage/src/mage/abilities/effects/common/ReturnFromExileEffect.java
+++ b/Mage/src/mage/abilities/effects/common/ReturnFromExileEffect.java
@@ -92,8 +92,9 @@ public class ReturnFromExileEffect extends OneShotEffect {
                     switch (zone) {
                         case BATTLEFIELD:
                             card.moveToZone(zone, source.getSourceId(), game, tapped);
-                            if (!game.isSimulation())
-                                game.informPlayers(new StringBuilder(controller.getName()).append(" moves ").append(card.getName()).append(" to ").append(zone.toString()).toString());
+                            if (!game.isSimulation()) {
+                                game.informPlayers(controller.getName() + " moves " + card.getName() + " to " + zone.toString().toLowerCase());
+                            }
                             break;
                         case HAND:
                             controller.moveCardToHandWithInfo(card, source.getSourceId(), game, Zone.EXILED);
@@ -106,8 +107,9 @@ public class ReturnFromExileEffect extends OneShotEffect {
                             break;
                         default:
                             card.moveToZone(zone, source.getSourceId(), game, tapped);
-                            if (!game.isSimulation())
-                                game.informPlayers(new StringBuilder(controller.getName()).append(" moves ").append(card.getName()).append(" to ").append(zone.toString()).toString());
+                            if (!game.isSimulation()) {
+                                game.informPlayers(controller.getName() + " moves " + card.getName() + " to " + zone.toString().toLowerCase());
+                            }
                     }
                 }
             }
diff --git a/Mage/src/mage/abilities/effects/keyword/ManifestEffect.java b/Mage/src/mage/abilities/effects/keyword/ManifestEffect.java
index c966fcf5e4..7fbb96ce7c 100644
--- a/Mage/src/mage/abilities/effects/keyword/ManifestEffect.java
+++ b/Mage/src/mage/abilities/effects/keyword/ManifestEffect.java
@@ -32,7 +32,6 @@ import mage.MageObjectReference;
 import mage.abilities.Ability;
 import mage.abilities.costs.mana.ManaCosts;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.effects.ContinuousEffect;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.continuous.BecomesFaceDownCreatureEffect;
 import mage.abilities.effects.common.continuous.BecomesFaceDownCreatureEffect.FaceDownType;
@@ -44,7 +43,6 @@ import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
-import mage.target.targetpointer.FixedTarget;
 import mage.util.CardUtil;
 
 /**