diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java
index f22285e..839619c 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java
@@ -345,22 +345,22 @@ public class Client {
           }
           break;
         case GuiParameters.listOfLobbies:
-          updateListOfLobbies(data);
+          //updateListOfLobbies(data); (commented out due to compiling error)
           //TODO
           break;
         case GuiParameters.listOfPLayers:
           updateListOfClients(data);
           //TODO
           break;
-        case GuiParameters.viewChangeToGame:
+        //case GuiParameters.viewChangeToGame: (commented out due to compiling error)
           //TODO
-          break;
-        case GuiParameters.viewChangeToStart:
+          //break; (commented out due to compiling error)
+        //case GuiParameters.viewChangeToStart: (commented out due to compiling error)
           //TODO
-          break;
-        case GuiParameters.viewChangeToLobby:
+          //break; (commented out due to compiling error)
+        //case GuiParameters.viewChangeToLobby: (commented out due to compiling error)
           //TODO
-          break;
+          //break; (commented out due to compiling error)
         default:
           notificationTextDisplay(data);
           //TODO(Sebi,Seraina): should the gameController be in the Application just like the ChatController?
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LoungeSceneViewController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LoungeSceneViewController.java
index c9abea2..f6885f6 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LoungeSceneViewController.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LoungeSceneViewController.java
@@ -65,7 +65,7 @@ public class LoungeSceneViewController implements Initializable {
   }
 
   public void addLobby(LobbyListItem lobby) {
-    LobbyTreeView.
+    //TODO fix/complete following code: LobbyTreeView. (commented out due to compiling error)
   }
 
   public void addClientToList(ClientListItem player) {
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/JServerProtocolParser.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/JServerProtocolParser.java
index a9f031e..1ee67ab 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/JServerProtocolParser.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/JServerProtocolParser.java
@@ -100,7 +100,7 @@ public class JServerProtocolParser {
         break;
       case Protocol.leaveLobby:
         h.leaveLobby();
-        h.sendMsgToClient(Protocol.printToGUI + "$" + GuiParameters.viewChangeToStart + "$");
+        //h.sendMsgToClient(Protocol.printToGUI + "$" + GuiParameters.viewChangeToStart + "$"); (commented out due to compiling error)
         break;
       case Protocol.votedFor:
         LOGGER.debug("Made it here");
@@ -109,7 +109,7 @@ public class JServerProtocolParser {
         break;
       case Protocol.startANewGame:
         h.startNewGame();
-        h.sendMsgToClientsInLobby(Protocol.printToGUI + "$" + GuiParameters.viewChangeToGame + "$");
+        //h.sendMsgToClientsInLobby(Protocol.printToGUI + "$" + GuiParameters.viewChangeToGame + "$"); (commented out due to compiling error)
         break;
       case Protocol.listGames:
         h.listGames();
diff --git a/src/test/java/ch/unibas/dmi/dbis/cs108/gamelogic/NoiseHandlerTest.java b/src/test/java/ch/unibas/dmi/dbis/cs108/gamelogic/NoiseHandlerTest.java
index aef87aa..d5a5014 100644
--- a/src/test/java/ch/unibas/dmi/dbis/cs108/gamelogic/NoiseHandlerTest.java
+++ b/src/test/java/ch/unibas/dmi/dbis/cs108/gamelogic/NoiseHandlerTest.java
@@ -10,7 +10,7 @@ import static org.junit.jupiter.api.Assertions.*;
  * Tests the noise handling of the game: will the passengers the ghost(s) walk(ed) by while going to
  * their victim receive the right amount of noise notifications? Since the noises heard by
  * passengers are stored in designated noiseAmount arrays, the following tests check if the content
- * of those arrays match expected values. Different cases are being analyzed: ghost infects victim
+ * of those arrays matches expected values. Different cases are being analyzed: ghost infects victim
  * while being on his right / on his left; two ghosts infect a victim while coming from the same
  * side / from different sides; four ghosts dispersed all over the train infect a victim.
  */