diff --git a/client/js/input.js b/client/js/input.js
index 421ce2e..abe64bb 100644
--- a/client/js/input.js
+++ b/client/js/input.js
@@ -31,7 +31,7 @@ export function startInputListener() {
             if (ev.code === "KeyB") {
                 debug_enabled = !debug_enabled
                 if (debug_enabled) {
-                    debug_style.innerHTML = "* {box-shadow: 0 0 1px red inset;}"
+                    debug_style.innerHTML = "* {box-shadow: 0 0 3px red inset;}"
                 } else {
                     debug_style.innerHTML = ""
                 }
diff --git a/client/js/logic.js b/client/js/logic.js
index e9a0b05..405366c 100644
--- a/client/js/logic.js
+++ b/client/js/logic.js
@@ -147,16 +147,42 @@ const init_map = (data) => {
 
     document.getElementById("lobby").style.display = "none"
 
-    let width = 13
-    let height = 5  
+    // let width = 13
+    // let height = 5  
+    // let m_data = [
+    //     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    //     1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1,
+    //     1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1,
+    //     1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1,
+    //     1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1
+    // ]
+
+    let width = 21
+    let height = 21
     let m_data = [
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1,
-        1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1,
-        1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1,
-        1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1
+        1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+        1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,
+        1,0,1,1,1,0,1,1,1,0,1,0,1,1,1,0,1,1,1,0,1,
+        1,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,1,
+        1,0,1,0,1,1,1,1,1,0,1,0,1,1,1,1,1,0,1,0,1,
+        1,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,1,
+        1,0,1,1,1,0,1,0,1,1,1,1,1,0,1,0,1,1,1,0,1,
+        1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+        1,1,1,0,1,0,1,0,1,1,1,1,1,0,1,0,1,0,1,1,1,
+        1,0,0,0,0,0,1,0,1,0,0,0,1,0,1,0,0,0,0,0,1,
+        1,0,1,1,1,0,1,0,1,0,0,0,1,0,1,0,1,1,1,0,1,
+        1,0,0,0,0,0,1,0,1,0,0,0,1,0,1,0,0,0,0,0,1,
+        1,1,1,0,1,0,1,0,1,1,0,1,1,0,1,0,1,0,1,1,1,
+        1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+        1,0,1,1,1,0,1,0,1,1,1,1,1,0,1,0,1,1,1,0,1,
+        1,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,1,
+        1,0,1,0,1,1,1,1,1,0,1,0,1,1,1,1,1,0,1,0,1,
+        1,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,1,
+        1,0,1,1,1,0,1,1,1,0,1,0,1,1,1,0,1,1,1,0,1,
+        1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,
+        1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
     ]
-    
+
     data.map = new Map(width, height, m_data)
     data.map.show()
 }
diff --git a/client/js/main.js b/client/js/main.js
index 81262d3..1d241b7 100644
--- a/client/js/main.js
+++ b/client/js/main.js
@@ -71,7 +71,7 @@ function startGame(code, name) {
                 return false
             }
 
-            let players = Object.values(start_data.data.players).filter(p => { return p.name !== undefined })
+            let players = Object.values(start_data.data.players).filter(p => { return p !== null && p.name !== undefined })
             if (players.length >= 4) {
                 alert('Room is full')
                 return false
diff --git a/client/static/cross.png b/client/static/cross.png
index 4ee9824..c8d1054 100644
Binary files a/client/static/cross.png and b/client/static/cross.png differ
diff --git a/client/static/dot.png b/client/static/dot.png
index 600e373..bab810b 100644
Binary files a/client/static/dot.png and b/client/static/dot.png differ
diff --git a/client/static/tee.png b/client/static/tee.png
index e3857fc..ca144be 100644
Binary files a/client/static/tee.png and b/client/static/tee.png differ
diff --git a/client/static/turn.png b/client/static/turn.png
index e6a93cf..c951f17 100644
Binary files a/client/static/turn.png and b/client/static/turn.png differ
diff --git a/client/static/wall.png b/client/static/wall.png
index f54d2fa..19d4168 100644
Binary files a/client/static/wall.png and b/client/static/wall.png differ
diff --git a/client/static/wall_end.png b/client/static/wall_end.png
index 7b28b61..4f09e19 100644
Binary files a/client/static/wall_end.png and b/client/static/wall_end.png differ