diff --git a/MotionToPhotonMeter.ino b/MotionToPhotonMeter.ino
index 261d6c8db8a0773de8c99cc49789ee0ee265661c..034cfd781300f8708a28296bbfe3d4150a2182db 100644
--- a/MotionToPhotonMeter.ino
+++ b/MotionToPhotonMeter.ino
@@ -58,7 +58,11 @@ void core1( void * pvParameters ){
 		if(current_internal_status == InternalStatus::NotZeroed
 			&& result_number < requested_measurements){
 			zeroServo(); //Rearm
-			delay(5000 + random(1,11)); // Five seconds + random delay
+			
+			do{
+				delay(2000 + random(1,11)); // Two seconds + random delay
+			}while(getPhotoDiodeReading() < triggerValue); //Prevent false resets
+			
 			rotation_servo.write(zeroValueForServo - deflection); //deflection movement
 		}
 		
diff --git a/MotionToPhotonServer.cpp b/MotionToPhotonServer.cpp
index bb3f6192944d1735cd6fb8dc20576212cd8259d1..de95b06da4721eeb9299678bc4193e8214f9121b 100644
--- a/MotionToPhotonServer.cpp
+++ b/MotionToPhotonServer.cpp
@@ -54,7 +54,8 @@
 	}
 	
 	void MotionToPhotonServer::pageStatus(){
-		server.send(200, "text/plain", String(getStatus())); 
+		unsigned int results = getCurrentNumberOfResults();
+		server.send(200, "text/plain", String(getStatus()) + ((results > 0) ? ": " + String(results):"") ); 
 	}
 
 	void MotionToPhotonServer::pageSetThreshold(){