diff --git a/src/API/PermissionsAPI.php b/src/API/PermissionsAPI.php
index 0ef95725c..887ee3745 100644
--- a/src/API/PermissionsAPI.php
+++ b/src/API/PermissionsAPI.php
@@ -45,9 +45,6 @@ class PermissionsAPI{
 
 	}
 
-	/**
-	 * @access public
-	 */
 	public function init()
 	{
 		ServerAPI::request()->api->addHandler("player.connect", function ($player)//Use a better event than player.connect. Player.create maybe?
@@ -60,6 +57,11 @@ class PermissionsAPI{
 				$player->permission = new DefaultPermission();
 			}
 		}, 1);//Experimental. Use Closure / Anonymous Functions to assign new functions from each API rather than hard-coding them to Player.php.
+
+        ServerAPI::request()->api->addHandler("player.connect", function ($player)
+            {
+
+            }, 1);
 	}
 }
 
diff --git a/src/API/ServerAPI.php b/src/API/ServerAPI.php
index 6aed18de4..8ea0eb70b 100644
--- a/src/API/ServerAPI.php
+++ b/src/API/ServerAPI.php
@@ -30,6 +30,8 @@ class ServerAPI{
 	private $rcon;
 	private $query;
 
+    //TODO: Instead of hard-coding functions, use PHPDoc-compatible methods to load APIs.
+
 	/**
 	 * @var ConsoleAPI
 	 */
diff --git a/src/PocketMinecraftServer.php b/src/PocketMinecraftServer.php
index c16e43874..b04ceeb31 100644
--- a/src/PocketMinecraftServer.php
+++ b/src/PocketMinecraftServer.php
@@ -85,7 +85,10 @@ class PocketMinecraftServer{
 		$this->load();
 	}
 
-	public function getTPS(){
+    /**
+     * @return float
+     */
+    public function getTPS(){
 		$v = array_values($this->tickMeasure);
 		$tps = 40 / ($v[39] - $v[0]);
 		return round($tps, 4);
@@ -179,7 +182,10 @@ class PocketMinecraftServer{
 		return $info;
 	}
 
-	public function close($reason = "server stop"){
+    /**
+     * @param string $reason
+     */
+    public function close($reason = "server stop"){
 		if($this->stop !== true){
 			if(is_int($reason)){
 				$reason = "signal stop";
@@ -271,7 +277,14 @@ class PocketMinecraftServer{
 		}
 	}
 
-	public function addHandler($event,callable $callable, $priority = 5){
+    /**
+     * @param string $event
+     * @param callable $callable
+     * @param integer $priority
+     *
+     * @return boolean
+     */
+    public function addHandler($event,callable $callable, $priority = 5){
 		if(!is_callable($callable)){
 			return false;
 		}elseif(isset(Deprecation::$events[$event])){
@@ -339,7 +352,10 @@ class PocketMinecraftServer{
 		}
 	}
 
-	public function getGamemode(){
+    /**
+     * @return string
+     */
+    public function getGamemode(){
 		switch($this->gamemode){
 			case SURVIVAL:
 				return "survival";