diff --git a/dumbserver.js b/dumbserver.js
index c1c4699..ef6f610 100644
--- a/dumbserver.js
+++ b/dumbserver.js
@@ -30,7 +30,6 @@ try {
 //
 let flush = function()
 {
-    console.log('Caught deadly signal.');
     console.log('Flushing data to file [' + DATA_FILE + ']\n');
     fs.writeFileSync(DATA_FILE, JSON.stringify(store));
 };
@@ -121,6 +120,7 @@ let serveRestData = function(key, req, resp) {
                     resp.write('{"success":false, "error":"Invalid JSON"}');
                 }
                 resp.end();
+				flush();
             });
             break;
 			
@@ -160,12 +160,10 @@ http.createServer(function(req, resp) {
 	
 	resp.setHeader('Access-Control-Allow-Methods','GET, POST, PUT, DELETE, OPTIONS');
 	
-    let uri = req.url //.replace(/^\/+|\/+$/g, ''); // trim slashes
 	console.log('Serving [' + req.url + ']');
    
-    if (uri === '/') { // server index file
-		uri = 'index.html'; 
-        serveFile(uri, req, resp);
+    if (req.url  === '/') { // server index file
+        serveFile('index.html', req, resp);
 	} else { // rest request
         serveRestData(req.url, req, resp);
     }