diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBCommandAssembly.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBCommandAssembly.java
index d1a0de12e..202538435 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBCommandAssembly.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBCommandAssembly.java
@@ -77,6 +77,8 @@ public class NBCommandAssembly {
                 throw new BasicError("Found zero commands for spec;" + cmd);
             }
             String containerName = cmd.getTargetContext();
+
+            // TODO, make this unnecessary by moving the impl out of the map to a dedicated cmd structure
             params.remove("_impl");
             parameterizedInvocations.add(new CommandInvocation(command, params, containerName));
         }
diff --git a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/stabilization/StabilityDetector.java b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/stabilization/StabilityDetector.java
index 356469861..631b8c598 100644
--- a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/stabilization/StabilityDetector.java
+++ b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/stabilization/StabilityDetector.java
@@ -155,6 +155,9 @@ public class StabilityDetector implements Runnable {
         }
     }
 
+    // TODO: Add a check for when stddev is lower than some fixed value, or when both
+    // (or all) windows are below some small threshold
+    // and perhaps add auto-correlation checks for (any of) style unblocking
     private void updateAndAwait() {
         int interval = (int) (this.timeSliceSeconds * 1000);
         startedAt = System.currentTimeMillis();