diff --git a/src/main/java/electrosphere/engine/loadingthreads/ViewportLoading.java b/src/main/java/electrosphere/engine/loadingthreads/ViewportLoading.java
index ef115810..ddb0e52d 100644
--- a/src/main/java/electrosphere/engine/loadingthreads/ViewportLoading.java
+++ b/src/main/java/electrosphere/engine/loadingthreads/ViewportLoading.java
@@ -57,7 +57,7 @@ public class ViewportLoading {
             try {
                 TimeUnit.MILLISECONDS.sleep(10);
             } catch (InterruptedException e) {
-                throw new Error("Loading thread was interrupted!");
+                throw new Error("Loading thread was interrupted - failed to initialize player!");
             }
         }
         //add player to viewport realm
@@ -76,7 +76,7 @@ public class ViewportLoading {
             try {
                 TimeUnit.MILLISECONDS.sleep(10);
             } catch (InterruptedException e) {
-                throw new Error("Loading thread was interrupted!");
+                throw new Error("Loading thread was interrupted - failed to get world data on client!");
             }
         }
 
diff --git a/src/main/java/electrosphere/net/client/protocol/AuthProtocol.java b/src/main/java/electrosphere/net/client/protocol/AuthProtocol.java
index 83978554..0685ab4b 100644
--- a/src/main/java/electrosphere/net/client/protocol/AuthProtocol.java
+++ b/src/main/java/electrosphere/net/client/protocol/AuthProtocol.java
@@ -15,12 +15,11 @@ public class AuthProtocol implements ClientProtocolTemplate<AuthMessage> {
     @Override
     public AuthMessage handleAsyncMessage(AuthMessage message) {
         switch(message.getMessageSubtype()){
-            case AUTHREQUEST:
+            case AUTHREQUEST: {
                 //Try login
-                //TODO: actually get user/pass
                 Globals.clientState.clientConnection.queueOutgoingMessage(AuthMessage.constructAuthDetailsMessage(Globals.clientState.clientUsername,Globals.clientState.clientPassword));
-                break;
-            case AUTHSUCCESS:
+            } break;
+            case AUTHSUCCESS: {
                 //clean password hash from memory
                 Globals.clientState.clientPassword = "";
                 //request playable races
@@ -29,15 +28,15 @@ public class AuthProtocol implements ClientProtocolTemplate<AuthMessage> {
                 Globals.clientState.clientConnection.queueOutgoingMessage(CharacterMessage.constructRequestCharacterListMessage());
                 //log that we succeeded
                 LoggerInterface.loggerAuth.INFO("Successfully logged in");
-                break;
-            case AUTHFAILURE:
+            } break;
+            case AUTHFAILURE: {
                 //TODO: handle better
                 LoggerInterface.loggerAuth.ERROR("Auth failure",new Exception("Auth failure"));
-                break;
+            } break;
             //ignore stack
-            case AUTHDETAILS:
+            case AUTHDETAILS: {
                 //silently ignore
-                break;
+            } break;
         }
         return null;
     }
diff --git a/src/main/java/electrosphere/net/server/player/PlayerManager.java b/src/main/java/electrosphere/net/server/player/PlayerManager.java
index d0e0d50d..aadf956e 100644
--- a/src/main/java/electrosphere/net/server/player/PlayerManager.java
+++ b/src/main/java/electrosphere/net/server/player/PlayerManager.java
@@ -20,10 +20,19 @@ public class PlayerManager {
         
     }
     
+    /**
+     * Registers a player
+     * @param player The player
+     */
     public void registerPlayer(Player player){
         idMap.put(player.getId(),player);
     }
     
+    /**
+     * Gets a player by their id
+     * @param id The id of the player
+     * @return The player if it exists, null otherwise
+     */
     public Player getPlayerFromId(int id){
         return idMap.get(id);
     }
@@ -39,6 +48,10 @@ public class PlayerManager {
         return null;
     }
 
+    /**
+     * Gets the list of all players
+     * @return The list of all players
+     */
     public List<Player> getPlayers(){
         List<Player> rVal = new LinkedList<Player>();
         if(idMap != null && idMap.size() > 0){
diff --git a/src/main/java/electrosphere/server/ServerState.java b/src/main/java/electrosphere/server/ServerState.java
index ac4ea7f4..2de0063e 100644
--- a/src/main/java/electrosphere/server/ServerState.java
+++ b/src/main/java/electrosphere/server/ServerState.java
@@ -73,7 +73,7 @@ public class ServerState {
     /**
      * Player manager
      */
-    public PlayerManager playerManager = new PlayerManager();
+    public final PlayerManager playerManager = new PlayerManager();
 
     /**
      * Database controller