diff --git a/Mage.Sets/src/mage/sets/gatecrash/CryptGhast.java b/Mage.Sets/src/mage/sets/gatecrash/CryptGhast.java
index d871fea4ec..2c99e612fb 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/CryptGhast.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/CryptGhast.java
@@ -29,9 +29,9 @@
 package mage.sets.gatecrash;
 
 import java.util.UUID;
-import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
+import mage.Constants.Zone;
 import mage.MageInt;
 import mage.Mana;
 import mage.abilities.effects.common.BasicManaEffect;
@@ -77,14 +77,13 @@ public class CryptGhast extends CardImpl<CryptGhast> {
 
 class CryptGhastTriggeredAbility extends TriggeredManaAbility<CryptGhastTriggeredAbility> {
     
-    private final static FilterControlledLandPermanent filter = new FilterControlledLandPermanent("Island");
-    
+    private final static FilterControlledLandPermanent filter = new FilterControlledLandPermanent("Swamp");
     static {
             filter.add(new SubtypePredicate("Swamp"));
     }
 
     public CryptGhastTriggeredAbility() {
-        super(Constants.Zone.BATTLEFIELD, new BasicManaEffect(Mana.BlackMana));
+        super(Zone.BATTLEFIELD, new BasicManaEffect(Mana.BlackMana), true);
         this.usesStack = false;
     }
 
@@ -94,9 +93,11 @@ class CryptGhastTriggeredAbility extends TriggeredManaAbility<CryptGhastTriggere
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        Permanent land = game.getPermanent(event.getTargetId());
-        if (event.getType() == GameEvent.EventType.TAPPED_FOR_MANA && land != null && filter.match(land, game)) {
-            return true;
+        if (event.getType() == GameEvent.EventType.TAPPED_FOR_MANA) {
+            Permanent land = game.getPermanent(event.getTargetId());
+            if (land != null && filter.match(land, game)) {
+                return true;
+            }
         }
         return false;
     }
@@ -110,4 +111,4 @@ class CryptGhastTriggeredAbility extends TriggeredManaAbility<CryptGhastTriggere
     public String getRule() {
         return "Whenever you tap a Swamp for mana, you may add {B} to your mana pool";
     }
-}
\ No newline at end of file
+}
diff --git a/Mage.Sets/src/mage/sets/gatecrash/DinrovaHorror.java b/Mage.Sets/src/mage/sets/gatecrash/DinrovaHorror.java
index d22be01d10..b0880256b3 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/DinrovaHorror.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/DinrovaHorror.java
@@ -28,22 +28,19 @@
 package mage.sets.gatecrash;
 
 import java.util.UUID;
-import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Outcome;
 import mage.Constants.Rarity;
+import mage.Constants.Zone;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
-import mage.abilities.effects.Effect;
 import mage.abilities.effects.OneShotEffect;
-import mage.abilities.effects.common.ReturnToHandTargetEffect;
 import mage.cards.CardImpl;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
 import mage.target.TargetPermanent;
-import mage.target.targetpointer.FixedTarget;
 
 /**
  *
@@ -99,11 +96,11 @@ class DinrovaHorrorEffect extends OneShotEffect<DinrovaHorrorEffect> {
         Permanent target = game.getPermanent(source.getFirstTarget());
         Player controller = game.getPlayer(target.getControllerId());
         if (target != null && controller != null) {
-            target.moveToZone(Constants.Zone.HAND, id, game, true);
+            target.moveToZone(Zone.HAND, source.getSourceId(), game, true);
             controller.discard(1, source, game);
             return true;
         }
         return false;
 
     }
-}
\ No newline at end of file
+}
diff --git a/Mage.Sets/src/mage/sets/gatecrash/FathomMage.java b/Mage.Sets/src/mage/sets/gatecrash/FathomMage.java
index e2776f37d1..d578479345 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/FathomMage.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/FathomMage.java
@@ -104,6 +104,6 @@ class FathomMageTriggeredAbility extends TriggeredAbilityImpl<FathomMageTriggere
 
     @Override
     public String getRule() {
-        return "Whenever a +1/+1 counter is placed on Fathom Mage, " + super.getRule();
+        return "Whenever a +1/+1 counter is placed on {this}, " + super.getRule();
     }
 }
diff --git a/Mage.Sets/src/mage/sets/gatecrash/FiveAlarmFire.java b/Mage.Sets/src/mage/sets/gatecrash/FiveAlarmFire.java
index 322942a38b..985a8bb407 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/FiveAlarmFire.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/FiveAlarmFire.java
@@ -28,9 +28,9 @@
 package mage.sets.gatecrash;
 
 import java.util.UUID;
-import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
+import mage.Constants.Zone;
 import mage.abilities.Ability;
 import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.common.SimpleActivatedAbility;
@@ -41,7 +41,6 @@ import mage.cards.CardImpl;
 import mage.counters.CounterType;
 import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.game.Game;
-import mage.game.events.DamagedCreatureEvent;
 import mage.game.events.DamagedEvent;
 import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
@@ -62,7 +61,7 @@ public class FiveAlarmFire extends CardImpl<FiveAlarmFire> {
         //Whenever a creature you control deals combat damage, put a blaze counter on Five-Alarm Fire.
         this.addAbility(new FiveAlarmFireTriggeredAbility());
         //Remove five blaze counters from Five-Alarm Fire: Five-Alarm Fire deals 5 damage to target creature or player.
-        Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new DamageTargetEffect(5), new RemoveCountersSourceCost(CounterType.BLAZE.createInstance(5)));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(5), new RemoveCountersSourceCost(CounterType.BLAZE.createInstance(5)));
         ability.addTarget(new TargetCreatureOrPlayer());
         this.addAbility(ability);
     }
@@ -83,7 +82,7 @@ class FiveAlarmFireTriggeredAbility extends TriggeredAbilityImpl<FiveAlarmFireTr
     private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent();
     
     public FiveAlarmFireTriggeredAbility() {
-        super(Constants.Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.BLAZE.createInstance()), false);
+        super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.BLAZE.createInstance()), false);
     }
 
     public FiveAlarmFireTriggeredAbility(final FiveAlarmFireTriggeredAbility ability) {
diff --git a/Mage/src/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java b/Mage/src/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java
index be5f65462d..5100d5e902 100644
--- a/Mage/src/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java
+++ b/Mage/src/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java
@@ -112,7 +112,7 @@ public class LookLibraryAndPickControllerEffect extends LookLibraryControllerEff
                         cards.remove(card);
                         card.moveToZone(targetPickedCards, source.getId(), game, false);
                         if (revealPickedCards) {
-                            Cards reveal = new CardsImpl(Zone.OUTSIDE);
+                            Cards reveal = new CardsImpl();
                             reveal.add(card);
                             player.revealCards(windowName, reveal, game);
                         }
diff --git a/Mage/src/mage/abilities/mana/TriggeredManaAbility.java b/Mage/src/mage/abilities/mana/TriggeredManaAbility.java
index c4293e0b34..8dfd2df30e 100644
--- a/Mage/src/mage/abilities/mana/TriggeredManaAbility.java
+++ b/Mage/src/mage/abilities/mana/TriggeredManaAbility.java
@@ -38,7 +38,11 @@ import mage.abilities.effects.common.ManaEffect;
 public abstract class TriggeredManaAbility<T extends TriggeredManaAbility<T>> extends TriggeredAbilityImpl<T> {
 
     public TriggeredManaAbility(Zone zone, ManaEffect effect) {
-        super(zone, effect);
+        this(zone, effect, false);
+    }
+
+    public TriggeredManaAbility(Zone zone, ManaEffect effect, boolean optional) {
+        super(zone, effect, optional);
     }
 
     public TriggeredManaAbility(final TriggeredManaAbility ability) {