diff --git a/website/javascript.js b/website/javascript.js
index 3579448..b5fc0d0 100644
--- a/website/javascript.js
+++ b/website/javascript.js
@@ -4,7 +4,7 @@ let changeTickButton = document.getElementById("changeTick");
 let changeIdButton = document.getElementById("tickLeistenId");
 let reloadButton = document.getElementById("reload");
 let saveButton = document.getElementById("save");
-let url = "wss://nerfingen.de:8080/";
+let url = "ws://10.9.1.129:8080/";
 var players = [];
 let Id = Math.floor(Math.random()*10000000000000000).toString(16)
 var ws = new WebSocket(url + Id);
@@ -22,10 +22,16 @@ ws.onmessage = function(evt){
             valid = true;
             for (i = 0; i < players.length; i++){
                 if (players[i].UUID == obj.playerUUID){
-                    players[i].Tick = obj.tick.tickValue;
+                    if (obj.tick.tickType == "Tick"){
+                        players[i].Tick = obj.tick.tickValue;
+                    }
+                    else {
+                        players[i].Tick = obj.tick.tickType;
+                    }
                     var pl = players[i];
                     players.splice(i,1);
                     AddPlayer(pl);
+                    break;
                 }
             }
             PlayerList();
@@ -38,10 +44,10 @@ ws.onmessage = function(evt){
             newPlayer.Name = obj.playerName;
             newPlayer.UUID = obj.playerUUID;
             if (obj.tick.tickType == "Tick"){
-            newPlayer.Tick = obj.tick.tickValue;
+                newPlayer.Tick = obj.tick.tickValue;
             }
             else {
-            newPlayer.Tick = tickType;
+                newPlayer.Tick = obj.tick.tickType;
             }
             AddPlayer(newPlayer);
             PlayerList();
@@ -95,14 +101,17 @@ addButton.onclick = function() {
                         var type = "";
                         if (document.getElementById("A2").value == "Abwarten") {
                             type = "Abwarten";
+                            ws.send('{"requestType" : "AddPlayerTickR", "playerName" : "' + document.getElementById("A1").value + '"  , "tick" : {"tickType" : "' + type + '", "tickValue" : "' + document.getElementById("A2").value + '"}}');
                         }
                         if (document.getElementById("A2").value == "Bereithalten") {
                             type = "Bereithalten";
+                            ws.send('{"requestType" : "AddPlayerTickR", "playerName" : "' + document.getElementById("A1").value + '"  , "tick" : {"tickType" : "' + type + '", "tickValue" : "' + document.getElementById("A2").value + '"}}');
                         }
                         else {
                             type = "Tick";
+                            ws.send('{"requestType" : "AddPlayerTickR", "playerName" : "' + document.getElementById("A1").value + '"  , "tick" : {"tickType" : "' + type + '", "tickValue" : ' + document.getElementById("A2").value + '}}');
                         }
-                        ws.send('{"requestType" : "AddPlayerTickR", "playerName" : "' + document.getElementById("A1").value + '"  , "tick" : {"tickType" : "' + type + '", "tickValue" : ' + document.getElementById("A2").value + '}}');
+                        
 }
 
 /*When the Button is clicked, a RemovePlayerR request is send to the server.*/
@@ -124,17 +133,18 @@ changeTickButton.onclick = function() {
                         for (i = 0; i < players.length; i++){
                             if (players[i].Name == document.getElementById("C1").value){
                                 UUID = players[i].UUID;
-                                if (players[i].tick == "Abwarten" || players[i].tick == "Bereithalten"){
-                                    type = players[i].Tick;
+                                if (Tick == "Abwarten" || Tick == "Bereithalten"){
+                                    ws.send('{"requestType" : "SetPlayerTickR", "playerUUID" : "' + UUID + '", "tick" : {"tickType" : "' + Tick + '"}}');
+                                    break;
                                 }
                                 else {
                                     type = "Tick";
+                                    ws.send('{"requestType" : "SetPlayerTickR", "playerUUID" : "' + UUID + '", "tick" : {"tickType" : "' + type + '", "tickValue" : ' + Tick + '}}');
+                                    break;
                                 }
                             }
                         }
-                        /*console.log(Tick);
-                        console.log('{"requestType" : "SetPlayerTickR", "playerUUID" : "' + UUID + '", "tick" : {"tickType" : "' + type + '", "tickValue" : ' + Tick + '}}');*/
-                        ws.send('{"requestType" : "SetPlayerTickR", "playerUUID" : "' + UUID + '", "tick" : {"tickType" : "' + type + '", "tickValue" : ' + Tick + '}}');
+                        
                      }
 
 /*When the Button is clicked, a new WebSocket connection is opened with the new ID*/
@@ -170,6 +180,10 @@ function CurrentPlayer(){
                             document.getElementById("p2").innerHTML = players[0].Name;
                             document.getElementById("p1").innerHTML = "" + players[0].Tick;
                             }
+                            else{
+                            document.getElementById("p2").innerHTML = "-";
+                            document.getElementById("p1").innerHTML = "-";
+                            }
                     }
 
 function AddPlayer(player){
@@ -196,13 +210,21 @@ function AddPlayer(player){
                             }
                             else {
                                 for (i = 0; i<players.length;i++){
-                                    if (player.Tick < players[i].Tick){
+                                    if (players[i].Tick == "Abwarten" || players[i].Tick == "Bereithalten"){
                                         players.splice(i,0,player);
                                         added = true;
-                                        break;
+                                        break
                                     }
-                                    if (i == players.length -1 && added == false){
-                                        players.push(player);
+                                    else {
+                                        if (player.Tick < players[i].Tick){
+                                            players.splice(i,0,player);
+                                            added = true;
+                                            break;
+                                        }
+                                        if (i == (players.length -1) && added == false){
+                                            players.push(player);
+                                            break;
+                                        }
                                     }
                                 }
                             }