diff --git a/application/core/Admin/ActionsMenu.php b/application/core/Admin/ActionsMenu.php
index a86b9ddc..4fc9cf90 100644
--- a/application/core/Admin/ActionsMenu.php
+++ b/application/core/Admin/ActionsMenu.php
@@ -10,6 +10,7 @@ use FML\Controls\Quads\Quad_Icons64x64_1;
 use FML\ManiaLink;
 use FML\Script\Script;
 use ManiaControl\Callbacks\CallbackListener;
+use ManiaControl\Callbacks\CallbackManager;
 use ManiaControl\ManiaControl;
 use ManiaControl\Manialinks\ManialinkPageAnswerListener;
 use ManiaControl\Players\Player;
@@ -53,7 +54,7 @@ class ActionsMenu implements CallbackListener, ManialinkPageAnswerListener {
 		$this->maniaControl->settingManager->initSetting($this, self::SETTING_MENU_ITEMSIZE, 6.);
 
 		// Register for callbacks
-		$this->maniaControl->callbackManager->registerCallbackListener(PlayerManager::CB_ONINIT, $this, 'handleOnInit');
+		$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_AFTERINIT, $this, 'handleAfterInit');
 		$this->maniaControl->callbackManager->registerCallbackListener(PlayerManager::CB_PLAYERCONNECT, $this, 'handlePlayerJoined');
 		$this->maniaControl->callbackManager->registerCallbackListener(AuthenticationManager::CB_AUTH_LEVEL_CHANGED, $this, 'handlePlayerJoined');
 	}
@@ -122,9 +123,9 @@ class ActionsMenu implements CallbackListener, ManialinkPageAnswerListener {
 	}
 
 	/**
-	 * Handle ManiaControl OnInit callback
+	 * Handle ManiaControl AfterInit callback
 	 */
-	public function handleOnInit() {
+	public function handleAfterInit() {
 		$this->initCompleted = true;
 		$this->rebuildAndShowMenu();
 	}
diff --git a/application/core/Chat.php b/application/core/Chat.php
index 2fa4250f..4238817c 100644
--- a/application/core/Chat.php
+++ b/application/core/Chat.php
@@ -2,7 +2,6 @@
 
 namespace ManiaControl;
 
-use Maniaplanet\DedicatedServer\Xmlrpc\Exception;
 /**
  * Chat utility class
  *
@@ -68,15 +67,10 @@ class Chat {
 			return false;
 		}
 		$chatMessage = '$z$<' . $this->getPrefix($prefix) . $message . '$>$z';
-		try {
-			if ($login === null) {
-				$this->maniaControl->client->chatSendServerMessage($chatMessage);
-			} else {
-				$this->maniaControl->client->chatSendServerMessage($chatMessage, $login);
-			}
-		} catch(Exception $e) {
-			// TODO: is it even possible that an exception other than connection errors will be thrown? - remove try-catch?
-			return false;
+		if ($login === null) {
+			$this->maniaControl->client->chatSendServerMessage($chatMessage);
+		} else {
+			$this->maniaControl->client->chatSendServerMessage($chatMessage, $login);
 		}
 		return true;
 	}
diff --git a/application/core/Manialinks/IconManager.php b/application/core/Manialinks/IconManager.php
index 5bc5fb6e..825430b5 100644
--- a/application/core/Manialinks/IconManager.php
+++ b/application/core/Manialinks/IconManager.php
@@ -6,6 +6,7 @@ use FML\Controls\Frame;
 use FML\Controls\Quad;
 use FML\ManiaLink;
 use ManiaControl\Callbacks\CallbackListener;
+use ManiaControl\Callbacks\CallbackManager;
 use ManiaControl\ManiaControl;
 use ManiaControl\Players\PlayerManager;
 use ManiaControl\Players\Player;
@@ -47,7 +48,7 @@ class IconManager implements CallbackListener {
 		$this->addDefaultIcons();
 
 		// Register for callbacks
-		$this->maniaControl->callbackManager->registerCallbackListener(PlayerManager::CB_ONINIT, $this, 'handleOnInit');
+		$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_AFTERINIT, $this, 'handleAfterInit');
 		$this->maniaControl->callbackManager->registerCallbackListener(PlayerManager::CB_PLAYERCONNECT, $this, 'handlePlayerConnect');
 	}
 
@@ -88,7 +89,7 @@ class IconManager implements CallbackListener {
 	/**
 	 * Handle OnInit Callback
 	 */
-	public function handleOnInit() {
+	public function handleAfterInit() {
 		$this->preloadIcons();
 	}
 
diff --git a/application/core/Maps/MapCommands.php b/application/core/Maps/MapCommands.php
index 5219a878..3a131001 100644
--- a/application/core/Maps/MapCommands.php
+++ b/application/core/Maps/MapCommands.php
@@ -11,7 +11,6 @@ use ManiaControl\ManiaControl;
 use ManiaControl\Manialinks\IconManager;
 use ManiaControl\Manialinks\ManialinkPageAnswerListener;
 use ManiaControl\Players\Player;
-use Maniaplanet\DedicatedServer\Xmlrpc\Exception;
 
 /**
  * Class offering commands to manage maps
@@ -105,16 +104,10 @@ class MapCommands implements CommandListener, ManialinkPageAnswerListener, Callb
 			$map = $nextQueued[1];
 			$this->maniaControl->chat->sendInformation("Next map is $<" . $map->name . "$> from $<" . $map->authorNick . "$> requested by $<" . $requester->nickname . "$>.", $player->login);
 		} else {
-			try {
-				$mapIndex = $this->maniaControl->client->getNextMapIndex();
-			} catch(Exception $e) {
-				// TODO: is it even possible that an exception other than connection errors will be thrown? - remove try-catch?
-				trigger_error("Error while Reading the next Map Index");
-				$this->maniaControl->chat->sendError("Error while Reading next Map Inde");
-				return;
-			}
-			$maps = $this->maniaControl->mapManager->getMaps();
-			$map  = $maps[$mapIndex];
+
+			$mapIndex = $this->maniaControl->client->getNextMapIndex();
+			$maps     = $this->maniaControl->mapManager->getMaps();
+			$map      = $maps[$mapIndex];
 			$this->maniaControl->chat->sendInformation("Next map is $<" . $map->name . "$> from $<" . $map->authorNick . "$>.", $player->login);
 		}
 	}
@@ -190,13 +183,7 @@ class MapCommands implements CommandListener, ManialinkPageAnswerListener, Callb
 			return;
 		}
 
-		try {
-			$this->maniaControl->client->nextMap();
-		} catch(Exception $e) {
-			// TODO: is it even possible that an exception other than connection errors will be thrown? - remove try-catch?
-			$this->maniaControl->chat->sendError("Error while Skipping the Map");
-			return;
-		}
+		$this->maniaControl->client->nextMap();
 
 		$message = '$<' . $player->nickname . '$> skipped the current Map!';
 		$this->maniaControl->chat->sendSuccess($message);
@@ -217,12 +204,8 @@ class MapCommands implements CommandListener, ManialinkPageAnswerListener, Callb
 		$message = '$<' . $player->nickname . '$> restarted the current Map!';
 		$this->maniaControl->chat->sendSuccess($message);
 		$this->maniaControl->log($message, true);
-		try {
-			$this->maniaControl->client->restartMap();
-		} catch(Exception $e) {
-			// TODO: is it even possible that an exception other than connection errors will be thrown? - remove try-catch?
-			//do nothing
-		}
+
+		$this->maniaControl->client->restartMap();
 	}
 
 	/**
diff --git a/application/core/Maps/MapManager.php b/application/core/Maps/MapManager.php
index 9445d46b..1efbcb7f 100644
--- a/application/core/Maps/MapManager.php
+++ b/application/core/Maps/MapManager.php
@@ -545,23 +545,21 @@ class MapManager implements CallbackListener {
 	public function addMapFromMx($mapId, $login, $update = false) {
 		if (is_numeric($mapId)) {
 			// Check if map exists
-			$this->maniaControl->mapManager->mxManager->getMapInfo($mapId, function (MXMapInfo $mapInfo) use ($login) {
+			$this->maniaControl->mapManager->mxManager->getMapInfo($mapId, function (MXMapInfo $mapInfo) use (&$login, &$update) {
 				if (!$mapInfo || !isset($mapInfo->uploaded)) {
 					// Invalid id
 					$this->maniaControl->chat->sendError('Invalid MX-Id!', $login);
 					return;
 				}
-
 				//Download the file
-				$function = function ($file, $error) use (&$login, &$mapInfo, &$mapDir, &$update) {
+				$this->maniaControl->fileReader->loadFile($mapInfo->downloadurl, function ($file, $error) use (&$login, &$mapInfo, &$mapDir, &$update) {
 					if (!$file) {
 						// Download error
 						$this->maniaControl->chat->sendError('Download failed!', $login);
 						return;
 					}
 					$this->processMapFile($file, $mapInfo, $mapDir, $login, $update);
-				};
-				$this->maniaControl->fileReader->loadFile($mapInfo->downloadurl, $function);
+				});
 			});
 		}
 	}
diff --git a/application/core/Players/PlayerActions.php b/application/core/Players/PlayerActions.php
index b8e11720..75cdbb12 100644
--- a/application/core/Players/PlayerActions.php
+++ b/application/core/Players/PlayerActions.php
@@ -87,6 +87,7 @@ class PlayerActions {
 			$this->maniaControl->client->forceSpectator($target->login, self::SPECTATOR_PLAYER);
 		} catch(Exception $e) {
 			// TODO: only possible valid exception should be "wrong login" - throw others (like connection error)
+			$this->maniaControl->errorHandler->triggerDebugNotice("PlayerActions Debug Line 90: " . $e->getMessage());
 			$this->maniaControl->chat->sendError('Error occurred: ' . $e->getMessage(), $admin->login);
 			return;
 		}
@@ -96,6 +97,7 @@ class PlayerActions {
 				$this->maniaControl->client->forceSpectator($target->login, self::SPECTATOR_USER_SELECTABLE);
 			} catch(Exception $e) {
 				// TODO: only possible valid exception should be "wrong login" - throw others (like connection error)
+				$this->maniaControl->errorHandler->triggerDebugNotice("PlayerActions Debug Line 100: " . $e->getMessage());
 				$this->maniaControl->chat->sendError('Error occurred: ' . $e->getMessage(), $admin->login);
 				return;
 			}
@@ -178,6 +180,7 @@ class PlayerActions {
 			try {
 				$this->maniaControl->client->spectatorReleasePlayerSlot($target->login);
 			} catch(Exception $e) {
+				$this->maniaControl->errorHandler->triggerDebugNotice("PlayerActions Debug Line 183: " . $e->getMessage());
 				// TODO: only possible valid exception should be "wrong login" - throw others (like connection error)
 				//do nothing
 			}
@@ -348,6 +351,7 @@ class PlayerActions {
 			}
 		} catch(Exception $e) {
 			// TODO: only possible valid exception should be "wrong login" - throw others (like connection error)
+			$this->maniaControl->errorHandler->triggerDebugNotice("PlayerActions Debug Line 354: " . $e->getMessage());
 			$this->maniaControl->chat->sendError('Error occurred: ' . $e->getMessage(), $admin->login);
 			return;
 		}
diff --git a/application/core/Players/PlayerCommands.php b/application/core/Players/PlayerCommands.php
index bac5a0e1..be0793b3 100644
--- a/application/core/Players/PlayerCommands.php
+++ b/application/core/Players/PlayerCommands.php
@@ -107,6 +107,7 @@ class PlayerCommands implements CommandListener, ManialinkPageAnswerListener, Ca
 		try {
 			$this->maniaControl->client->autoTeamBalance();
 		} catch(Exception $e) {
+			$this->maniaControl->errorHandler->triggerDebugNotice("PlayerCommands Debug Line 110: " . $e->getMessage());
 			// TODO: only catch 'not in team mode' exception - throw others (like connection error)
 			$this->maniaControl->chat->sendError('Error occurred: ' . $e->getMessage(), $player->login);
 			return;
diff --git a/application/core/Players/PlayerList.php b/application/core/Players/PlayerList.php
index a2916175..41846063 100644
--- a/application/core/Players/PlayerList.php
+++ b/application/core/Players/PlayerList.php
@@ -650,6 +650,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer
 					$this->maniaControl->client->forceSpectator($adminLogin, PlayerActions::SPECTATOR_BUT_KEEP_SELECTABLE);
 					$this->maniaControl->client->forceSpectatorTarget($adminLogin, $targetLogin, 1);
 				} catch(Exception $e) {
+					$this->maniaControl->errorHandler->triggerDebugNotice("PlayerList Debug Line 653: " . $e->getMessage());
 					// TODO: only possible valid exception should be "wrong login" - throw others (like connection error)
 				}
 				break;
@@ -724,6 +725,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer
 					} catch(Exception $e) {
 						//do nothing
 						// TODO: only possible valid exception should be "wrong login" - throw others (like connection error)
+						$this->maniaControl->errorHandler->triggerDebugNotice("PlayerList Debug Line 727: " . $e->getMessage());
 					}
 				});
 				break;
@@ -747,6 +749,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer
 					try {
 						$this->maniaControl->client->kick($target->login, $message);
 					} catch(Exception $e) {
+						$this->maniaControl->errorHandler->triggerDebugNotice("PlayerList Debug Line 751: " . $e->getMessage());
 						// TODO: only possible valid exception should be "wrong login" - throw others (like connection error)
 						$this->maniaControl->chat->sendError('Error occurred: ' . $e->getMessage(), $target->login);
 						return;
diff --git a/application/core/Players/PlayerManager.php b/application/core/Players/PlayerManager.php
index ea5ae351..7261c3f2 100644
--- a/application/core/Players/PlayerManager.php
+++ b/application/core/Players/PlayerManager.php
@@ -20,7 +20,6 @@ class PlayerManager implements CallbackListener {
 	 */
 	const CB_PLAYERCONNECT            = 'PlayerManagerCallback.PlayerConnect';
 	const CB_PLAYERDISCONNECT         = 'PlayerManagerCallback.PlayerDisconnect';
-	const CB_ONINIT                   = 'PlayerManagerCallback.OnInit';
 	const CB_PLAYERINFOCHANGED        = 'PlayerManagerCallback.PlayerInfoChanged';
 	const TABLE_PLAYERS               = 'mc_players';
 	const SETTING_JOIN_LEAVE_MESSAGES = 'Enable Join & Leave Messages';
@@ -135,10 +134,6 @@ class PlayerManager implements CallbackListener {
 			$player->hasJoinedGame = true;
 			$this->addPlayer($player);
 		}
-
-		// Trigger own callback
-		// TODO: what for?
-		$this->maniaControl->callbackManager->triggerCallback(self::CB_ONINIT);
 	}
 
 	/**
diff --git a/application/core/Server/RankingManager.php b/application/core/Server/RankingManager.php
index ec2f7e31..ec15c7da 100644
--- a/application/core/Server/RankingManager.php
+++ b/application/core/Server/RankingManager.php
@@ -30,14 +30,14 @@ class RankingManager implements CallbackListener {
 	 *
 	 * @param \ManiaControl\ManiaControl $maniaControl
 	 */
-	public function __construct(ManiaControl $maniaControl) { //TODO statistic wins
+	public function __construct(ManiaControl $maniaControl) {
 		$this->maniaControl = $maniaControl;
 
 		//Register Callbacks
 		$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_MODESCRIPTCALLBACK, $this, 'handleCallbacks');
 		$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_MODESCRIPTCALLBACKARRAY, $this, 'handleCallbacks');
 		$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_ONINIT, $this, 'onInit');
-		//TODO won message at end of the map (disable as setting)
+		//TODO won message at end of the map (disable as setting) (and public announce only all %50 (setting) players)
 	}
 
 	/**
diff --git a/application/core/Statistics/StatisticCollector.php b/application/core/Statistics/StatisticCollector.php
index 4c2b9931..cd6f7182 100644
--- a/application/core/Statistics/StatisticCollector.php
+++ b/application/core/Statistics/StatisticCollector.php
@@ -60,7 +60,7 @@ class StatisticCollector implements CallbackListener {
 	 *
 	 * @param \ManiaControl\ManiaControl $maniaControl
 	 */
-	public function __construct(ManiaControl $maniaControl) { //TODO statistic wins
+	public function __construct(ManiaControl $maniaControl) {
 		$this->maniaControl = $maniaControl;
 
 		//Register Callbacks
diff --git a/application/plugins/ChatMessagePlugin.php b/application/plugins/ChatMessagePlugin.php
index ee61794b..f72b3802 100644
--- a/application/plugins/ChatMessagePlugin.php
+++ b/application/plugins/ChatMessagePlugin.php
@@ -313,6 +313,7 @@ class ChatMessagePlugin implements CommandListener, Plugin {
 		try {
 			$this->maniaControl->client->kick($player->login, $message);
 		} catch(Exception $e) {
+			$this->maniaControl->errorHandler->triggerDebugNotice("ChatMessagePlugin Debug Line 316: " . $e->getMessage());
 			// TODO: only possible valid exception should be "wrong login" - throw others (like connection error)
 			$this->maniaControl->chat->sendError('Error occurred: ' . $e->getMessage(), $player->login);
 			return;
@@ -333,6 +334,7 @@ class ChatMessagePlugin implements CommandListener, Plugin {
 		try {
 			$this->maniaControl->client->kick($player->login, $message);
 		} catch(Exception $e) {
+			$this->maniaControl->errorHandler->triggerDebugNotice("ChatMessagePlugin Debug Line " . $e->getLine() . ": " . $e->getMessage());
 			// TODO: only possible valid exception should be "wrong login" - throw others (like connection error)
 			$this->maniaControl->chat->sendError('Error occurred: ' . $e->getMessage(), $player->login);
 			return;
@@ -354,6 +356,7 @@ class ChatMessagePlugin implements CommandListener, Plugin {
 			try {
 				$this->maniaControl->client->forceSpectator($player->login, 3);
 			} catch(Exception $e) {
+				$this->maniaControl->errorHandler->triggerDebugNotice("ChatMessagePlugin Debug Line " . $e->getLine() . ": " . $e->getMessage());
 				// TODO: only possible valid exception should be "wrong login" - throw others (like connection error)
 				$this->maniaControl->chat->sendError('Error occurred: ' . $e->getMessage(), $player->login);
 				return;
@@ -363,6 +366,7 @@ class ChatMessagePlugin implements CommandListener, Plugin {
 			try {
 				$this->maniaControl->client->spectatorReleasePlayerSlot($player->login);
 			} catch(Exception $e) {
+				$this->maniaControl->errorHandler->triggerDebugNotice("ChatMessagePlugin Debug Line " . $e->getLine() . ": " . $e->getMessage());
 				// TODO: only possible valid exception should be "wrong login" - throw others (like connection error)
 				//to nothing
 			}
@@ -386,7 +390,7 @@ class ChatMessagePlugin implements CommandListener, Plugin {
 			$pid++;
 		}
 
-		if ($login == 'lj') {
+		if ($login == 'lj' && $pid > 1) {
 			return $player->nickname;
 		}
 
@@ -435,6 +439,6 @@ class ChatMessagePlugin implements CommandListener, Plugin {
 	 * @return string
 	 */
 	public static function getDescription() {
-		return null;
+		return "Plugin offers various Chat-Commands like /gg /hi /afk /rq...";
 	}
 }
\ No newline at end of file
diff --git a/application/plugins/DynamicPointlimitPlugin.php b/application/plugins/DynamicPointlimitPlugin.php
index b44d93ff..e2ee3590 100644
--- a/application/plugins/DynamicPointlimitPlugin.php
+++ b/application/plugins/DynamicPointlimitPlugin.php
@@ -1,10 +1,7 @@
 <?php
 use ManiaControl\Callbacks\CallbackListener;
-use ManiaControl\Callbacks\CallbackManager;
 use ManiaControl\Commands\CommandListener;
 use ManiaControl\ManiaControl;
-use ManiaControl\Manialinks\ManialinkPageAnswerListener;
-use ManiaControl\Manialinks\ManialinkManager;
 use ManiaControl\Players\Player;
 use ManiaControl\Players\PlayerManager;
 use ManiaControl\Plugins\Plugin;
@@ -22,10 +19,11 @@ class DynamicPointlimitPlugin implements CallbackListener, CommandListener, Plug
 	const ID      = 21;
 	const VERSION = 0.1;
 
-	const DYNPNT_MULTIPLIER = 'Pointlimit multiplier';
-	const DYNPNT_OFFSET     = 'Pointlimit offset';
-	const DYNPNT_MIN        = 'Minimum pointlimit';
-	const DYNPNT_MAX        = 'Maximum pointlimit';
+	const DYNPNT_MULTIPLIER  = 'Pointlimit multiplier';
+	const DYNPNT_OFFSET      = 'Pointlimit offset';
+	const DYNPNT_MIN         = 'Minimum pointlimit';
+	const DYNPNT_MAX         = 'Maximum pointlimit';
+	const ACCEPT_OTHER_MODES = 'Activate in Other mode as Royal';
 
 	/**
 	 * Prepares the Plugin
@@ -34,7 +32,11 @@ class DynamicPointlimitPlugin implements CallbackListener, CommandListener, Plug
 	 * @return mixed
 	 */
 	public static function prepare(ManiaControl $maniaControl) {
-		// TODO: Implement prepare() method.
+		$maniaControl->settingManager->initSetting(get_class(), self::ACCEPT_OTHER_MODES, false);
+		$maniaControl->settingManager->initSetting(get_class(), self::DYNPNT_MULTIPLIER, 10);
+		$maniaControl->settingManager->initSetting(get_class(), self::DYNPNT_OFFSET, 0);
+		$maniaControl->settingManager->initSetting(get_class(), self::DYNPNT_MIN, 30);
+		$maniaControl->settingManager->initSetting(get_class(), self::DYNPNT_MAX, 200);
 	}
 
 	/**
@@ -56,13 +58,9 @@ class DynamicPointlimitPlugin implements CallbackListener, CommandListener, Plug
 		$this->maniaControl->callbackManager->registerCallbackListener(PlayerManager::CB_PLAYERCONNECT, $this, 'changePointlimit');
 		$this->maniaControl->callbackManager->registerCallbackListener(PlayerManager::CB_PLAYERDISCONNECT, $this, 'changePointlimit');
 
-		$this->maniaControl->settingManager->initSetting($this, self::DYNPNT_MULTIPLIER, 10);
-		$this->maniaControl->settingManager->initSetting($this, self::DYNPNT_OFFSET, 0);
-		$this->maniaControl->settingManager->initSetting($this, self::DYNPNT_MIN, 30);
-		$this->maniaControl->settingManager->initSetting($this, self::DYNPNT_MAX, 200);
-
-		if($this->maniaControl->server->titleId != 'SMStormRoyal@nadeolabs') {
-			$error = 'This plugin only supports Royal!';
+		$allowOthers = $this->maniaControl->settingManager->getSetting($this, self::ACCEPT_OTHER_MODES);
+		if (!$allowOthers && $this->maniaControl->server->titleId != 'SMStormRoyal@nadeolabs') {
+			$error = 'This plugin only supports Royal (check Settings)!';
 			throw new Exception($error);
 		}
 	}
@@ -74,7 +72,7 @@ class DynamicPointlimitPlugin implements CallbackListener, CommandListener, Plug
 		$this->maniaControl->manialinkManager->unregisterManialinkPageAnswerListener($this);
 		$this->maniaControl->callbackManager->unregisterCallbackListener($this);
 
-		$this->maniaControl = null;
+		unset($this->maniaControl);
 	}
 
 	/**
@@ -133,7 +131,7 @@ class DynamicPointlimitPlugin implements CallbackListener, CommandListener, Plug
 
 		/** @var  Player $player */
 		foreach($this->maniaControl->playerManager->getPlayers() as $player) {
-			if($player->isSpectator) {
+			if ($player->isSpectator) {
 				$numberOfSpectators++;
 			} else {
 				$numberOfPlayers++;
@@ -144,10 +142,12 @@ class DynamicPointlimitPlugin implements CallbackListener, CommandListener, Plug
 
 		$min_value = $this->maniaControl->settingManager->getSetting($this, self::DYNPNT_MIN);
 		$max_value = $this->maniaControl->settingManager->getSetting($this, self::DYNPNT_MAX);
-		if($pointlimit < $min_value)
+		if ($pointlimit < $min_value) {
 			$pointlimit = $min_value;
-		if($pointlimit > $max_value)
+		}
+		if ($pointlimit > $max_value) {
 			$pointlimit = $max_value;
+		}
 
 		$this->maniaControl->client->setModeScriptSettings(array('S_MapPointsLimit' => $pointlimit));
 	}
diff --git a/application/plugins/Karma.php b/application/plugins/Karma.php
index e2ba7979..3a864020 100644
--- a/application/plugins/Karma.php
+++ b/application/plugins/Karma.php
@@ -203,7 +203,7 @@ class KarmaPlugin implements CallbackListener, TimerListener, Plugin {
 		// Loop players
 		foreach($players as $login => $player) {
 			// Get player vote
-			$vote = $this->getPlayerVote($player, $map); //TODO what is this for, vote nowhere used?
+			//$vote = $this->getPlayerVote($player, $map); //TODO what is this for, vote nowhere used?
 
 			// Adjust manialink for player's vote
 			$votesFrame = $this->manialink->votesFrame;
diff --git a/application/plugins/TeamSpeakPlugin.php b/application/plugins/TeamSpeakPlugin.php
index 4108b45c..c24149c5 100644
--- a/application/plugins/TeamSpeakPlugin.php
+++ b/application/plugins/TeamSpeakPlugin.php
@@ -6,7 +6,6 @@ use FML\Controls\Quad;
 use FML\Controls\Quads\Quad_Icons64x64_1;
 use FML\ManiaLink;
 use ManiaControl\Callbacks\CallbackListener;
-use ManiaControl\Callbacks\CallbackManager;
 use ManiaControl\Callbacks\TimerListener;
 use ManiaControl\Commands\CommandListener;
 use ManiaControl\ManiaControl;
@@ -52,13 +51,19 @@ class TeamSpeakPlugin implements CallbackListener, CommandListener, ManialinkPag
 	private $refreshInterval = 90;
 
 	/**
-	 * Prepares the Plugin
+	 * Prepares the Plugin (Init Settings)
 	 *
 	 * @param ManiaControl $maniaControl
 	 * @return mixed
 	 */
 	public static function prepare(ManiaControl $maniaControl) {
-		// TODO: Implement prepare() method.
+		$maniaControl->settingManager->initSetting(get_class(), self::TEAMSPEAK_SID, 1);
+		$maniaControl->settingManager->initSetting(get_class(), self::TEAMSPEAK_SERVERHOST, 'ts3.somehoster.com');
+		$maniaControl->settingManager->initSetting(get_class(), self::TEAMSPEAK_SERVERPORT, 9987);
+		$maniaControl->settingManager->initSetting(get_class(), self::TEAMSPEAK_QUERYHOST, '');
+		$maniaControl->settingManager->initSetting(get_class(), self::TEAMSPEAK_QUERYPORT, 10011);
+		$maniaControl->settingManager->initSetting(get_class(), self::TEAMSPEAK_QUERYUSER, '');
+		$maniaControl->settingManager->initSetting(get_class(), self::TEAMSPEAK_QUERYPASS, '');
 	}
 
 	/**
@@ -69,7 +74,6 @@ class TeamSpeakPlugin implements CallbackListener, CommandListener, ManialinkPag
 	 */
 	public function load(ManiaControl $maniaControl) {
 		$this->maniaControl = $maniaControl;
-		$this->addConfigs();
 		$this->checkConfig();
 
 		$this->refreshTime = time();
@@ -82,18 +86,6 @@ class TeamSpeakPlugin implements CallbackListener, CommandListener, ManialinkPag
 		$this->addToMenu();
 	}
 
-	/**
-	 * Function used to add the configuration options to the settings manager.
-	 */
-	private function addConfigs() {
-		$this->maniaControl->settingManager->initSetting($this, self::TEAMSPEAK_SID, 1);
-		$this->maniaControl->settingManager->initSetting($this, self::TEAMSPEAK_SERVERHOST, 'ts3.somehoster.com');
-		$this->maniaControl->settingManager->initSetting($this, self::TEAMSPEAK_SERVERPORT, 9987);
-		$this->maniaControl->settingManager->initSetting($this, self::TEAMSPEAK_QUERYHOST, '');
-		$this->maniaControl->settingManager->initSetting($this, self::TEAMSPEAK_QUERYPORT, 10011);
-		$this->maniaControl->settingManager->initSetting($this, self::TEAMSPEAK_QUERYUSER, '');
-		$this->maniaControl->settingManager->initSetting($this, self::TEAMSPEAK_QUERYPASS, '');
-	}
 
 	/**
 	 * Function used to check certain configuration options to check if they can be used.