diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
index 7e6699f112c..c21628ea5b0 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
@@ -1996,8 +1996,8 @@ public class CardFactoryUtil {
                     + " | TriggerDescription$ If you cast it any time a sorcery couldn't have been cast, "
                     + " the controller of the permanent it becomes sacrifices it at the beginning of the next cleanup step.";
 
-            final String strDelay = "DB$ DelayedTrigger | Mode$ Phase | Phase$ Cleanup | TriggerDescription$ At the beginning of the next cleanup step, sacrifice CARDNAME.";
-            final String strSac = "DB$ SacrificeAll | Defined$ Self";
+            final String strDelay = "DB$ DelayedTrigger | Mode$ Phase | Phase$ Cleanup | RememberObjects$ Self | TriggerDescription$ At the beginning of the next cleanup step, sacrifice CARDNAME.";
+            final String strSac = "DB$ SacrificeAll | Defined$ DelayTriggerRememberedLKI";
 
             SpellAbility saDelay = AbilityFactory.getAbility(strDelay, card);
             saDelay.setAdditionalAbility("Execute", (AbilitySub) AbilityFactory.getAbility(strSac, card));
diff --git a/forge-game/src/main/java/forge/game/card/CardPredicates.java b/forge-game/src/main/java/forge/game/card/CardPredicates.java
index 201eb8b0a57..b13b9ab0adc 100644
--- a/forge-game/src/main/java/forge/game/card/CardPredicates.java
+++ b/forge-game/src/main/java/forge/game/card/CardPredicates.java
@@ -228,7 +228,7 @@ public final class CardPredicates {
         return new Predicate<Card>() {
             @Override
             public boolean apply(final Card c) {
-                return (c != null) && c.isValid(restrictions, sourceController, source, spellAbility);
+                return c != null && c.isValid(restrictions, sourceController, source, spellAbility);
             }
         };
     }
@@ -237,7 +237,7 @@ public final class CardPredicates {
         return new Predicate<Card>() {
             @Override
             public boolean apply(final Card c) {
-                return (c != null) && c.isValid(restrictions, sourceController, source, spellAbility);
+                return c != null && c.isValid(restrictions, sourceController, source, spellAbility);
             }
         };
     }
diff --git a/forge-game/src/main/java/forge/game/cost/CostReveal.java b/forge-game/src/main/java/forge/game/cost/CostReveal.java
index 990cbb799e2..8c0cad57405 100644
--- a/forge-game/src/main/java/forge/game/cost/CostReveal.java
+++ b/forge-game/src/main/java/forge/game/cost/CostReveal.java
@@ -72,7 +72,7 @@ public class CostReveal extends CostPartWithList {
             modifiedHand.remove(source); // can't pay for itself
             handList = modifiedHand;
         }
-        handList = CardLists.getValidCards(handList, getType().split(","), payer, source, ability);
+        handList = CardLists.getValidCards(handList, getType(), payer, source, ability);
 
         return handList.size();
     }
diff --git a/forge-game/src/main/java/forge/game/phase/PhaseType.java b/forge-game/src/main/java/forge/game/phase/PhaseType.java
index 7bb60d98830..1e33f557fa7 100644
--- a/forge-game/src/main/java/forge/game/phase/PhaseType.java
+++ b/forge-game/src/main/java/forge/game/phase/PhaseType.java
@@ -116,8 +116,7 @@ public enum PhaseType {
                 String sTo = s.substring(idxArrow + 2);
                 PhaseType to = StringUtils.isBlank(sTo) ? PhaseType.CLEANUP : PhaseType.smartValueOf(sTo);
                 result.addAll(EnumSet.range(from, to));
-            }
-            else {
+            } else {
                 result.add(PhaseType.smartValueOf(s));
             }
         }
diff --git a/forge-gui/res/cardsfolder/g/gravecrawler.txt b/forge-gui/res/cardsfolder/g/gravecrawler.txt
index 19eceefe8aa..f68b694c1ed 100644
--- a/forge-gui/res/cardsfolder/g/gravecrawler.txt
+++ b/forge-gui/res/cardsfolder/g/gravecrawler.txt
@@ -3,7 +3,7 @@ ManaCost:B
 Types:Creature Zombie
 PT:2/1
 K:CARDNAME can't block.
-S:Mode$ Continuous | Affected$ Card.Self | AffectedZone$ GraveYard | EffectZone$ Graveyard | MayPlay$ True | IsPresent$ Zombie.YouCtrl | Description$ You may cast CARDNAME from your graveyard as long as you control a Zombie.
+S:Mode$ Continuous | Affected$ Card.Self | AffectedZone$ Graveyard | EffectZone$ Graveyard | MayPlay$ True | IsPresent$ Zombie.YouCtrl | Description$ You may cast CARDNAME from your graveyard as long as you control a Zombie.
 SVar:SacMe:3
 SVar:DiscardMe:3
 DeckHints:Type$Zombie
diff --git a/forge-gui/res/cardsfolder/m/marang_river_prowler.txt b/forge-gui/res/cardsfolder/m/marang_river_prowler.txt
index 95d5d5a6a92..f52ba3945ce 100644
--- a/forge-gui/res/cardsfolder/m/marang_river_prowler.txt
+++ b/forge-gui/res/cardsfolder/m/marang_river_prowler.txt
@@ -4,9 +4,8 @@ Types:Creature Human Rogue
 PT:2/1
 K:Unblockable
 K:CARDNAME can't block.
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ Graveyard | MayPlay$ True | IsPresent$ Permanent.Black+YouCtrl,Permanent.Green+YouCtrl | Description$ You may cast CARDNAME from you graveyard as long as you control a black or green permanent.
+S:Mode$ Continuous | Affected$ Card.Self | AffectedZone$ Graveyard | EffectZone$ Graveyard | MayPlay$ True | IsPresent$ Permanent.Black+YouCtrl,Permanent.Green+YouCtrl | Description$ You may cast CARDNAME from you graveyard as long as you control a black or green permanent.
 SVar:SacMe:3
 SVar:DiscardMe:3
 DeckHints:Color$Black|Green
-SVar:Picture:http://www.wizards.com/global/images/magic/general/marang_river_prowler.jpg
 Oracle:Marang River Prowler can't block and can't be blocked.\nYou may cast Marang River Prowler from your graveyard as long as you control a black or green permanent.