diff --git a/src/API/ServerAPI.php b/src/API/ServerAPI.php
index c57a195fd..77d717b92 100644
--- a/src/API/ServerAPI.php
+++ b/src/API/ServerAPI.php
@@ -106,7 +106,6 @@ class ServerAPI{
 			"max-players" => 20,
 			"allow-flight" => false,
 			"server-type" => "normal",
-			"time-per-second" => 20,
 			"gamemode" => CREATIVE,
 			"pvp" => true,
 			"difficulty" => 1,
@@ -300,8 +299,7 @@ class ServerAPI{
 		}
 		if($this->server instanceof PocketMinecraftServer){
 			$this->server->setType($this->getProperty("server-type"));
-			$this->server->timePerSecond = $this->getProperty("time-per-second");
-			$this->server->invisible = $this->getProperty("invisible");
+			$this->server->invisible = $this->getProperty("server-invisible");
 			$this->server->maxClients = $this->getProperty("max-players");
 			$this->server->description = $this->getProperty("description");
 			$this->server->motd = $this->getProperty("motd");
@@ -328,10 +326,9 @@ class ServerAPI{
 					break;
 				case "gamemode":
 				case "max-players":
-				case "port":
+				case "server-port":
 				case "debug":
 				case "difficulty":
-				case "time-per-second":
 					$v = (int) $v;
 					break;
 				case "server-id":
@@ -465,7 +462,7 @@ class ServerAPI{
 					break;
 				case "gamemode":
 				case "max-players":
-				case "port":
+				case "server-port":
 				case "debug":
 				case "difficulty":
 				case "time-per-second":
diff --git a/src/PocketMinecraftServer.php b/src/PocketMinecraftServer.php
index ba8eecaa4..7e8cac814 100644
--- a/src/PocketMinecraftServer.php
+++ b/src/PocketMinecraftServer.php
@@ -71,7 +71,7 @@ class PocketMinecraftServer{
 		$this->clients = array();
 		$this->spawn = array("x" => 128.5,"y" => 100,"z" =>  128.5);
 		$this->time = 0;
-		$this->timePerSecond = 10;
+		$this->timePerSecond = 20;
 		$this->tickMeasure = array_fill(0, 40, 0);
 		$this->setType("normal");
 		$this->interface = new MinecraftInterface("255.255.255.255", $this->port, true, false);