diff --git a/server.js b/server.js
index a98d5b7..7b568b7 100644
--- a/server.js
+++ b/server.js
@@ -145,26 +145,30 @@ io.on('connection', function(socket) {
     });
     socket.on("timerExpired", function(code) {
         let game = activeGames[Object.keys(activeGames).find((key) => key === code)];
-        game.winningTeam = "wolf";
-        game.state = "ended";
-        io.to(code).emit('state', game);
-    });
-    socket.on('killPlayer', function(id, code) {
-        let game = activeGames[Object.keys(activeGames).find((key) => key === code)];
-        let player = game.players.find((player) => player.id === id);
-        game.players.find((player) => player.id === id).dead = true;
-        game.message = player.name + ", a " + player.card.role + ", has been killed!";
-        const winCheck = teamWon(game);
-        if (winCheck === "wolf") {
+        if (game) {
             game.winningTeam = "wolf";
             game.state = "ended";
             io.to(code).emit('state', game);
-        } else if (winCheck === "village") {
-            game.winningTeam = "village";
-            game.state = "ended";
-            io.to(code).emit('state', game);
-        } else {
-            io.to(code).emit('state', game);
+        }
+    });
+    socket.on('killPlayer', function(id, code) {
+        let game = activeGames[Object.keys(activeGames).find((key) => key === code)];
+        if (game) {
+            let player = game.players.find((player) => player.id === id);
+            game.players.find((player) => player.id === id).dead = true;
+            game.message = player.name + ", a " + player.card.role + ", has been killed!";
+            const winCheck = teamWon(game);
+            if (winCheck === "wolf") {
+                game.winningTeam = "wolf";
+                game.state = "ended";
+                io.to(code).emit('state', game);
+            } else if (winCheck === "village") {
+                game.winningTeam = "village";
+                game.state = "ended";
+                io.to(code).emit('state', game);
+            } else {
+                io.to(code).emit('state', game);
+            }
         }
     });
 });
diff --git a/static/join.js b/static/join.js
index c271a6e..6783e12 100644
--- a/static/join.js
+++ b/static/join.js
@@ -17,12 +17,12 @@ socket.on('success', function() {
     if (sessionStorage.getItem("host")) {
         sessionStorage.removeItem("host");
     }
-    window.location.replace('/' + document.getElementById("code").value.toString().trim());
+    window.location.replace('/' + document.getElementById("code").value.toString().trim().toLowerCase());
 });
 
 document.getElementById("join-btn").addEventListener("click", function() {
     if (document.getElementById("name").value.length > 0) {
-        const code = document.getElementById("code").value.toString().trim();
+        const code = document.getElementById("code").value.toString().trim().toLowerCase();
         if (document.getElementById("name").classList.contains("error")) {
             document.getElementById("name").classList.remove("error");
             document.getElementById("name-error").innerText = "";
diff --git a/static/styles.css b/static/styles.css
index eefcead..37af746 100644
--- a/static/styles.css
+++ b/static/styles.css
@@ -24,8 +24,8 @@
 
     .card {
         padding: 0.5em;
-        width: 8em;
-        height: 11.5em;
+        width: 7em;
+        height: 10.5em;
         font-size: 0.9em;
         margin: 0 0.7em 0.7em 0;
     }
@@ -397,8 +397,8 @@ button {
 
 #card-select-header button {
     margin-right: 1em;
-    width: 11em;
-    padding: 1em;
+    width: 10em;
+    padding: 0.8em;
 }
 
 #card-select-header span {