diff --git a/application/core/ManiaControl.php b/application/core/ManiaControl.php
index 9c947bae..a3d207db 100644
--- a/application/core/ManiaControl.php
+++ b/application/core/ManiaControl.php
@@ -112,8 +112,8 @@ class ManiaControl implements CommandListener {
 		$this->chat = new Chat($this);
 		$this->commandManager = new CommandManager($this);
 		$this->server = new Server($this);
-		$this->playerManager = new PlayerManager($this);
 		$this->authenticationManager = new AuthenticationManager($this);
+		$this->playerManager = new PlayerManager($this);
 		$this->mapManager = new MapManager($this);
 		$this->configurator = new Configurator($this);
 		$this->pluginManager = new PluginManager($this);
diff --git a/application/core/Maps/MapList.php b/application/core/Maps/MapList.php
index 472814b3..8ab16764 100644
--- a/application/core/Maps/MapList.php
+++ b/application/core/Maps/MapList.php
@@ -68,7 +68,6 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
 		$this->maniaControl->callbackManager->registerCallbackListener(MapManager::CB_MAPS_UPDATED, $this, 'updateWidget');
 		$this->maniaControl->callbackManager->registerCallbackListener(MapManager::CB_KARMA_UPDATED, $this, 'updateWidget');
 		$this->maniaControl->callbackManager->registerCallbackListener(MapManager::CB_BEGINMAP, $this, 'updateWidget');
-		// TODO not working yet
 
 		$this->maniaControl->manialinkManager->registerManialinkPageAnswerListener(self::ACTION_SEARCH_MAPNAME, $this, 'showManiaExchangeList');
 		$this->maniaControl->manialinkManager->registerManialinkPageAnswerListener(self::ACTION_SEARCH_AUTHOR, $this, 'showManiaExchangeList');
diff --git a/application/core/Players/PlayerActions.php b/application/core/Players/PlayerActions.php
index 33401fcc..01b2bc80 100644
--- a/application/core/Players/PlayerActions.php
+++ b/application/core/Players/PlayerActions.php
@@ -34,10 +34,10 @@ class PlayerActions {
 	const SETTING_PERMISSION_FORCE_PLAYER_PLAY = 'Force Player to Play';
 	const SETTING_PERMISSION_FORCE_PLAYER_TEAM = 'Force Player to Team';
 	const SETTING_PERMISSION_FORCE_PLAYER_SPEC = 'Force Player to Spec';
-	const SETTING_PERMISSION_MUTE_PLAYER       = 'Mute PLayer';
-	const SETTING_PERMISSION_WARN_PLAYER       = 'Warn PLayer';
-	const SETTING_PERMISSION_KICK_PLAYER       = 'Kick PLayer';
-	const SETTING_PERMISSION_BAN_PLAYER        = 'Ban PLayer';
+	const SETTING_PERMISSION_MUTE_PLAYER       = 'Mute Player';
+	const SETTING_PERMISSION_WARN_PLAYER       = 'Warn Player';
+	const SETTING_PERMISSION_KICK_PLAYER       = 'Kick Player';
+	const SETTING_PERMISSION_BAN_PLAYER        = 'Ban Player';
 
 	/**
 	 * Private Properties
@@ -59,7 +59,7 @@ class PlayerActions {
 		$this->maniaControl->authenticationManager->definePermissionLevel(self::SETTING_PERMISSION_MUTE_PLAYER, AuthenticationManager::AUTH_LEVEL_MODERATOR);
 		$this->maniaControl->authenticationManager->definePermissionLevel(self::SETTING_PERMISSION_FORCE_PLAYER_PLAY, AuthenticationManager::AUTH_LEVEL_MODERATOR);
 		$this->maniaControl->authenticationManager->definePermissionLevel(self::SETTING_PERMISSION_FORCE_PLAYER_TEAM, AuthenticationManager::AUTH_LEVEL_MODERATOR);
-		$this->maniaControl->authenticationManager->definePermissionLevel(self::SETTING_PERMISSION_FORCE_PLAYER_PLAY, AuthenticationManager::AUTH_LEVEL_MODERATOR);
+		$this->maniaControl->authenticationManager->definePermissionLevel(self::SETTING_PERMISSION_FORCE_PLAYER_SPEC, AuthenticationManager::AUTH_LEVEL_MODERATOR);
 	}
 
 	/**
diff --git a/application/core/Players/PlayerList.php b/application/core/Players/PlayerList.php
index 9cc5194a..68d9abc6 100644
--- a/application/core/Players/PlayerList.php
+++ b/application/core/Players/PlayerList.php
@@ -360,7 +360,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
 		$quadStyle    = $this->maniaControl->manialinkManager->styleManager->getDefaultMainWindowStyle();
 		$quadSubstyle = $this->maniaControl->manialinkManager->styleManager->getDefaultMainWindowSubStyle();
 
-		// TODO: all configurable or as constants
+		//Settings
 		$x         = $width / 2 + 2.5;
 		$width     = 35;
 		$height    = $height * 0.75;