diff --git a/Makefile b/Makefile
index 6750bd13f4..10aec8b05a 100644
--- a/Makefile
+++ b/Makefile
@@ -38,17 +38,6 @@ themes: \
 cards_diff: $(MAG)
 	for i in `hg stat -q src/magic/card release/Magarena/scripts | cut -d' ' -f2 | sort -t'/' -k4`; do hg diff $$i; done | flip -u - > $@
 
-code_to_remove: $(MAG)
-	cat src/magic/card/*.java | sed 's/\s\+//g' | sed 's/(.*)/(...)/g' | sort | uniq -c | sort -n | grep publicstaticfinal | grep ");" > $@
-
-casts: $(MAG)
-	grep -n "([A-Za-z]\+)[A-Za-z]\+" -r src/ > $@
-	flip -u $@
-
-nulls: $(MAG)
-	grep -n "null" -r src/ > $@
-	flip -u $@
-
 findbugs_warnings.txt: $(MAG)
 	~/App/findbugs/bin/findbugs \
 			-textui \
@@ -404,6 +393,17 @@ find_event_data: scripts/check_data.awk
 find_literals:
 	grep "\"" src/magic/card/* | awk -f scripts/check_literals.awk
 
+find_single_line_card_code: $(MAG)
+	cat src/magic/card/*.java | sed 's/\s\+//g' | sed 's/(.*)/(...)/g' | sort | uniq -c | sort -n | grep publicstaticfinal | grep ");" > $@
+
+find_casts: $(MAG)
+	grep -n "([A-Za-z]\+)[A-Za-z]\+" -r src/ > $@
+	flip -u $@
+
+find_nulls: $(MAG)
+	grep -n "null" -r src/ > $@
+	flip -u $@
+
 # meta check
 check: check_aura check_requires_card_code check_script_name
 
diff --git a/release/Magarena/scripts/Ravaging_Riftwurm.txt b/release/Magarena/scripts/Ravaging_Riftwurm.txt
index f2781c0435..82882e34f5 100644
--- a/release/Magarena/scripts/Ravaging_Riftwurm.txt
+++ b/release/Magarena/scripts/Ravaging_Riftwurm.txt
@@ -8,5 +8,5 @@ subtype=Wurm
 cost={1}{G}{G}
 pt=6/6
 timing=main
-ability=kicker {4} it enters the battlefield with three additional time counters on it
+ability=vanishing 2,kicker {4} it enters the battlefield with three additional time counters on it
 requires_card_code
diff --git a/release/Magarena/scripts/Tidewalker.txt b/release/Magarena/scripts/Tidewalker.txt
index b98004f676..f073bfe10e 100644
--- a/release/Magarena/scripts/Tidewalker.txt
+++ b/release/Magarena/scripts/Tidewalker.txt
@@ -7,4 +7,5 @@ type=Creature
 subtype=Elemental
 cost={2}{U}
 timing=main
+ability=vanishing 0
 requires_card_code
diff --git a/src/magic/card/Ravaging_Riftwurm.java b/src/magic/card/Ravaging_Riftwurm.java
index f3fff8e734..e885d5cfc7 100644
--- a/src/magic/card/Ravaging_Riftwurm.java
+++ b/src/magic/card/Ravaging_Riftwurm.java
@@ -10,21 +10,20 @@ import magic.model.trigger.MagicFadeVanishCounterTrigger;
 import magic.model.trigger.MagicWhenComesIntoPlayTrigger;
 
 public class Ravaging_Riftwurm {
-    public static final MagicFadeVanishCounterTrigger T = new MagicFadeVanishCounterTrigger("time");
-    
     public static final MagicWhenComesIntoPlayTrigger T2 = new MagicWhenComesIntoPlayTrigger() {
         @Override
         public MagicEvent executeTrigger(
             final MagicGame game,
             final MagicPermanent permanent,
             final MagicPlayer player) {    
-            final int amount = permanent.isKicked() ? 5 : 2;
-            game.doAction(new MagicChangeCountersAction(
-                permanent,
-                MagicCounterType.Charge,
-                amount,
-                true
-            ));
+            if (permanent.isKicked()) {
+                game.doAction(new MagicChangeCountersAction(
+                    permanent,
+                    MagicCounterType.Charge,
+                    3,
+                    true
+                ));
+            }
             return MagicEvent.NONE;
         }
     };
diff --git a/src/magic/card/Tidewalker.java b/src/magic/card/Tidewalker.java
index dfa7837196..591ddb9d08 100644
--- a/src/magic/card/Tidewalker.java
+++ b/src/magic/card/Tidewalker.java
@@ -22,8 +22,6 @@ public class Tidewalker {
         }
     };
     
-    public static final MagicFadeVanishCounterTrigger T1 = new MagicFadeVanishCounterTrigger("time");
-    
     public static final MagicWhenComesIntoPlayTrigger T2 = new MagicWhenComesIntoPlayTrigger() {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent, final MagicPlayer player) {
diff --git a/src/magic/model/MagicAbility.java b/src/magic/model/MagicAbility.java
index 6b7529ea6d..16922723f7 100644
--- a/src/magic/model/MagicAbility.java
+++ b/src/magic/model/MagicAbility.java
@@ -189,7 +189,9 @@ public enum MagicAbility {
     Vanishing("vanishing",-20) {
         public void addAbilityImpl(final MagicCardDefinition card, final String arg) {
             final int n = Integer.parseInt(arg);
-            card.add(new MagicComesIntoPlayWithCounterTrigger(MagicCounterType.Charge,"time",n));
+            if (n > 0) {
+                card.add(new MagicComesIntoPlayWithCounterTrigger(MagicCounterType.Charge,"time",n));
+            }
             card.add(new MagicFadeVanishCounterTrigger("time"));
         }
     },