diff --git a/assets/index.html b/assets/index.html
index d0826d4..a701c7b 100644
--- a/assets/index.html
+++ b/assets/index.html
@@ -50,6 +50,8 @@
   </body>
   <script>
     var playlist = [];
+    var socketConnector = null;
+    var socketSemaphore = false;
     var tag = document.createElement("script");
 
     tag.src = "https://www.youtube.com/iframe_api";
@@ -93,12 +95,38 @@
     }
 
     function connectSocket() {
+      if (socketSemaphore) {
+        console.log("Another connection attempt already in progress, canceling!");
+        return;
+      }
+      console.log("Connecting to socket");
+      socketSemaphore = true;
       baseUrl = window.location.host.replace("8080", "8090");
       let socket = new WebSocket("ws://" + baseUrl);
       socket.onopen = function (e) {
+        clearInterval(socketConnector);
+        socketConnector = null;
+        socketSemaphore = false;
         console.log("[open] Connection established");
       };
       // TODO: on close and on error attempt reconnect
+      socket.onclose = function (event) {
+        if (event.wasClean) {
+          console.log(
+            `[close] Connection closed cleanly, code=${event.code} reason=${event.reason}`
+          );
+        } else {
+          // e.g. server process killed or network down
+          // event.code is usually 1006 in this case
+          // TODO: add some nice ui thingi to show reconnect
+          // TODO: also add some timeout function to repeat this until connect is successful, let it interact with 'onopen'
+          console.log("[close] Connection died, attempting reconnect");
+          if (!socketConnector) {
+            socketConnector = setInterval(connectSocket, 5000);
+            socketSemaphore = false;
+          }
+        }
+      };
       socket.onmessage = function (event) {
         data = JSON.parse(event.data);
         if (data["videoId"] != undefined && data["videoId"] != null) {
@@ -113,6 +141,7 @@
           );
         }
       };
+      socketSemaphore = false;
     }
 
     function updatePlaylist() {
@@ -124,5 +153,12 @@
       });
       pl.innerHTML = output;
     }
+
+    //function myDebugger() {
+    //    console.log(socketSemaphore);
+    //    console.log(socketConnector);
+    //    console.log("=================");
+    //}
+    //myDebugger = setInterval(myDebugger, 2000);
   </script>
 </html>
diff --git a/config/config.json.example b/config/config.json.example
index c64aca2..36e642c 100644
--- a/config/config.json.example
+++ b/config/config.json.example
@@ -2,6 +2,7 @@
   "homeServerUrl": "https://matrix.your-homeserver.org",
   "accessToken": "youraccesstokencanbeobtainedthroughriot",
   "storage": "config/bot.json",
+  "assetDir": "assets/",
   "webServerPort": "8080",
   "webSocketServerPort":"8090",
   "monitorChannels": [
diff --git a/weirdradio.js b/weirdradio.js
index e1d265f..ce95dda 100644
--- a/weirdradio.js
+++ b/weirdradio.js
@@ -21,11 +21,13 @@ const client = new MatrixClient(
 );
 
 // load assets
+console.log("Reading assets...")
 let assets = [];
-var files = fs.readdirSync("assets/");
+var files = fs.readdirSync(config.assetDir);
 files.forEach((name) => {
   assets[name] = fs.readFileSync("assets/" + name);
 });
+console.log("[DONE]")
 // create server, this is for delivering the iframe page
 const webServer = http
   .createServer((req, res) => {