diff --git a/src/Control/ControlModule.cpp b/src/Control/ControlModule.cpp
index e09c76399..0c3b9ccd8 100644
--- a/src/Control/ControlModule.cpp
+++ b/src/Control/ControlModule.cpp
@@ -39,13 +39,13 @@ void poet::ControlModule::initiateWarmupPhase(bool dht_enabled,
     chem->SetWarmupEnabled(true);
     chem->SetDhtEnabled(false);
     chem->SetInterpEnabled(false);
-   // MSG("Warmup enabled until next control interval at iteration " +
-     //   std::to_string(control_interval) + ".");
+    MSG("Warmup enabled until next control interval at iteration " +
+        std::to_string(control_interval) + ".");
 
     if (rollback_enabled) {
       if (sur_disabled_counter > 0) {
         --sur_disabled_counter;
-        //MSG("Rollback counter: " + std::to_string(sur_disabled_counter));
+        MSG("Rollback counter: " + std::to_string(sur_disabled_counter));
       } else {
         rollback_enabled = false;
       }
@@ -64,16 +64,17 @@ void poet::ControlModule::applyControlLogic(ChemistryModule &chem,
     return;
   }
   writeCheckpointAndMetrics(chem, iter);
-
-  if (checkAndRollback(chem, iter) /* && rollback_count < 4*/) {
+  
+  if (checkAndRollback(chem, iter)  && rollback_count < 3) {
     rollback_enabled = true;
     rollback_count++;
     sur_disabled_counter = control_interval;
-    /*
+
     MSG("Interpolation disabled for the next " +
         std::to_string(control_interval) + ".");
-    */
+    
   }
+  
 }
 
 void poet::ControlModule::writeCheckpointAndMetrics(ChemistryModule &chem,
diff --git a/src/poet.cpp b/src/poet.cpp
index d6aecf04c..2d4ed4d71 100644
--- a/src/poet.cpp
+++ b/src/poet.cpp
@@ -439,13 +439,13 @@ static Rcpp::List RunMasterLoop(RInsidePOET &R, RuntimeParameters &params,
       Rcpp::wrap(chem.GetWorkerControlTimings());
       
 
-  if (params.use_dht) {
+  //if (params.use_dht) {
     chem_profiling["dht_hits"] = Rcpp::wrap(chem.GetWorkerDHTHits());
     chem_profiling["dht_evictions"] = Rcpp::wrap(chem.GetWorkerDHTEvictions());
     chem_profiling["dht_get_time"] = Rcpp::wrap(chem.GetWorkerDHTGetTimings());
     chem_profiling["dht_fill_time"] =
         Rcpp::wrap(chem.GetWorkerDHTFillTimings());
-  }
+  //}
 
   if (params.use_interp) {
     chem_profiling["interp_w"] =