diff --git a/MotionToPhotonMeter.ino b/MotionToPhotonMeter.ino
index 034cfd781300f8708a28296bbfe3d4150a2182db..0bc746f255d060b43c827911491efb3db01e64e0 100644
--- a/MotionToPhotonMeter.ino
+++ b/MotionToPhotonMeter.ino
@@ -47,6 +47,11 @@ MotionToPhotonServer server(result_buffer, result_buffer_length, getPhotoDiodeRe
 /* Multicore */
 TaskHandle_t TaskCore0;
 TaskHandle_t TaskCore1;
+const esp_task_wdt_config_t twdt_config = {
+        .timeout_ms = 6000,
+        .idle_core_mask = 0b00000011, // Disable on all cores
+        .trigger_panic = false,
+    };
 
 void core1( void * pvParameters ){
 	while(true){		
@@ -114,7 +119,7 @@ void setup() {
 	
 	server.setup();
 
-	esp_task_wdt_init(6000,false);
+	esp_task_wdt_init(&twdt_config);
 	xTaskCreatePinnedToCore(
                     core0,       // Task function.
                     "Server",    // name of task.
@@ -133,8 +138,7 @@ void setup() {
                     &TaskCore1,  // Task handle to keep track of created task
                     1);          // pin task to core 1             
 	delay(500);
-	disableCore0WDT();
-	disableCore1WDT();
+	esp_task_wdt_deinit();
 }
 
 void loop(){} //Still needed for arduino core to work
diff --git a/MotionToPhotonServer.cpp b/MotionToPhotonServer.cpp
index de95b06da4721eeb9299678bc4193e8214f9121b..6735c81bd568a923c4752d4173bb8b117cf0ebc6 100644
--- a/MotionToPhotonServer.cpp
+++ b/MotionToPhotonServer.cpp
@@ -104,14 +104,14 @@
 	}
 
 	void MotionToPhotonServer::pageResults(){
-		Serial.println("Client wants index page.");
+		Serial.println("Client wants results page.");
 		server.setContentLength(CONTENT_LENGTH_UNKNOWN);
 		server.send(200, "text/plain", "");
 		unsigned int currentNumberOfResults = getCurrentNumberOfResults();
 		for(unsigned int i = 0; i < currentNumberOfResults; i++){
 			server.sendContent(String(result_buffer[i]) + ((i != currentNumberOfResults-1) ? ",\n":""));
 		}
-		server.client().stop();
+		server.sendContent("");
 	}
 
 	void MotionToPhotonServer::pageIndex(){
diff --git a/MotionToPhotonServer.h b/MotionToPhotonServer.h
index a73cc9c31bca2064a11ebf0bb981c21bebc1f954..737fea948caeec6467fea4c63dfabbf7ec028403 100644
--- a/MotionToPhotonServer.h
+++ b/MotionToPhotonServer.h
@@ -2,8 +2,10 @@
 #define MotionToPhotonServer_h
 
 #include "Arduino.h"
+#include <WiFi.h>
 #include <WebServer.h>
 #include "SPIFFS.h"
+#include "FS.h"
 
 class MotionToPhotonServer
 {