diff --git a/src/PocketMine/Achievement.php b/src/PocketMine/Achievement.php
index 07fcc97b3..33d9ab84c 100644
--- a/src/PocketMine/Achievement.php
+++ b/src/PocketMine/Achievement.php
@@ -20,6 +20,7 @@
 */
 
 namespace PocketMine;
+use PocketMine\Utils\TextFormat;
 
 /**
  * Handles the achievement list and a bit more
@@ -105,9 +106,9 @@ abstract class Achievement{
 	public static function broadcast(Player $player, $achievementId){
 		if(isset(Achievement::$list[$achievementId])){
 			if(Server::getInstance()->getConfigString("announce-player-achievements", true) === true){
-				Server::getInstance()->broadcastMessage($player->getDisplayName() . " has just earned the achievement " . Achievement::$list[$achievementId]["name"]);
+				Server::getInstance()->broadcastMessage($player->getDisplayName() . " has just earned the achievement " . TextFormat::GREEN . Achievement::$list[$achievementId]["name"]);
 			}else{
-				$player->sendMessage("You have just earned the achievement " . Achievement::$list[$achievementId]["name"]);
+				$player->sendMessage("You have just earned the achievement " . TextFormat::GREEN . Achievement::$list[$achievementId]["name"]);
 			}
 
 			return true;
diff --git a/src/PocketMine/PocketMine.php b/src/PocketMine/PocketMine.php
index 06125b450..959165768 100644
--- a/src/PocketMine/PocketMine.php
+++ b/src/PocketMine/PocketMine.php
@@ -357,7 +357,7 @@ namespace PocketMine {
 		$server = new Server($autoloader, \PocketMine\PATH, \PocketMine\DATA, \PocketMine\PLUGIN_PATH);
 		$server->start();
 
-		kill(getmypid());
+		//kill(getmypid());
 		exit(0);
 	}
 
diff --git a/src/PocketMine/command/defaults/HelpCommand.php b/src/PocketMine/command/defaults/HelpCommand.php
index 89f32b4d9..97e2e2f08 100644
--- a/src/PocketMine/command/defaults/HelpCommand.php
+++ b/src/PocketMine/command/defaults/HelpCommand.php
@@ -90,8 +90,8 @@ class HelpCommand extends VanillaCommand{
 			if(($command = Server::getInstance()->getCommandMap()->getCommand(strtolower($command))) instanceof Command){
 				if($command->testPermissionSilent($sender)){
 					$message = TextFormat::YELLOW . "--------- " . TextFormat::WHITE . " Help: /" . $command->getName() . TextFormat::YELLOW . " ---------\n";
-					$message .= TextFormat::DARK_GREEN . "Description: " . TextFormat::WHITE . $command->getDescription() . "\n";
-					$message .= TextFormat::DARK_GREEN . "Usage: " . TextFormat::WHITE . implode("\n" . TextFormat::WHITE, explode("\n", $command->getUsage())) . "\n";
+					$message .= TextFormat::GOLD . "Description: " . TextFormat::WHITE . $command->getDescription() . "\n";
+					$message .= TextFormat::GOLD . "Usage: " . TextFormat::WHITE . implode("\n" . TextFormat::WHITE, explode("\n", $command->getUsage())) . "\n";
 					$sender->sendMessage($message);
 
 					return true;
diff --git a/src/PocketMine/plugin/FolderPluginLoader.php b/src/PocketMine/plugin/FolderPluginLoader.php
index c94f48657..80ce1f3e9 100644
--- a/src/PocketMine/plugin/FolderPluginLoader.php
+++ b/src/PocketMine/plugin/FolderPluginLoader.php
@@ -51,7 +51,7 @@ class FolderPluginLoader implements PluginLoader{
 		if(is_dir($file) and file_exists($file . "/plugin.yml") and file_exists($file . "/src/")){
 			if(($description = $this->getPluginDescription($file)) instanceof PluginDescription){
 				console("[INFO] Loading " . $description->getName());
-				$dataFolder = basename($file) . "/" . $description->getName();
+				$dataFolder = dirname($file) . DIRECTORY_SEPARATOR . $description->getName();
 				if(file_exists($dataFolder) and !is_dir($dataFolder)){
 					trigger_error("Projected dataFolder '" . $dataFolder . "' for " . $description->getName() . " exists and is not a directory", E_USER_WARNING);