diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingData.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingData.java
index b6cd6f74..7c4bcc3a 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingData.java
+++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingData.java
@@ -169,7 +169,7 @@ public class MovingData extends ACheckData {
     public double 	      passableVL;
 
 	// Data of the survival fly check.
-	public double 		sfHorizontalBuffer = SurvivalFly.hBufMax / 2.0;
+	public double 		sfHorizontalBuffer = 0.0; // ineffective: SurvivalFly.hBufMax / 2.0;
 	/** Event-counter to cover up for sprinting resetting server side only. Set in the FighListener. */
 	public int			lostSprintCount = 0;
 	public int 			sfJumpPhase = 0;
@@ -566,7 +566,7 @@ public class MovingData extends ACheckData {
 	}
 
 	/**
-	 * Get effective amount of all used velocity.
+	 * Get effective amount of all used velocity. Non-destructive.
 	 * @return
 	 */
 	public double getHorizontalFreedom() {
diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/SurvivalFly.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/SurvivalFly.java
index ef37a371..76906a44 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/SurvivalFly.java
+++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/SurvivalFly.java
@@ -182,7 +182,7 @@ public class SurvivalFly extends Check {
 		final boolean downStream = hDistance > walkSpeed * modSwim && from.isInLiquid() && from.isDownStream(xDistance, zDistance);
 		
 		// Handle ice.
-		// TODO: Maybe re-model ice stuff (test out what is really needed, e.g. modifier + reset on ground).
+		// TODO: Re-model ice stuff and other (e.g. general thing: ground-modifier + reset conditions).
 		if (from.isOnIce() || to.isOnIce()) {
 			data.sfOnIce = 20;
 		}
@@ -827,6 +827,8 @@ public class SurvivalFly extends Check {
     private double[] hDistAfterFailure(final Player player, final PlayerLocation from, final PlayerLocation to, final double walkSpeed, double hAllowedDistance, final double hDistance, double hDistanceAboveLimit, final double yDistance, final boolean sprinting, final boolean downStream, final MovingData data, final MovingConfig cc, final boolean skipPermChecks) {
 		
     	// TODO: Still not entirely sure about this checking order.
+    	// TODO: Return on 0 over dist.
+    	// TODO: Bunny hop: check here with simplified pre-conditions, if not matching re-check below.
     	
 		// After failure permission checks ( + speed modifier + sneaking + blocking + speeding) and velocity (!).
     	if (!skipPermChecks){