diff --git a/app.js b/app.js
index a2e6fcc..9b7d62c 100644
--- a/app.js
+++ b/app.js
@@ -11,20 +11,6 @@ catch(err) {
   settings = require('./config/default-settings');
 }
 
-var options = {
-  'motd': settings.motd,
-  'max-players': settings.maxPlayers,
-  'port': settings.port,
-  'online-mode': settings.onlineMode,
-  gameMode:settings.gameMode,
-  logging:settings.logging,
-  generation:settings.generation,
-  'modpe': settings.modpe,
-  kickTimeout: settings.kickTimeout ? settings.kickTimeout : 10*1000,
-  regionFolder: settings.regionFolder,
-  plugins: settings.plugins
-};
-
-module.exports=mcServer.createMCServer(options);
+module.exports=mcServer.createMCServer(settings);
 
 
diff --git a/config/default-settings.json b/config/default-settings.json
index 8098b6e..460cb3c 100644
--- a/config/default-settings.json
+++ b/config/default-settings.json
@@ -1,8 +1,8 @@
 {
   "motd": "A Minecraft Server \nRunning flying-squid",
   "port": 25565,
-  "maxPlayers": 10,
-  "onlineMode": true,
+  "max-players": 10,
+  "online-mode": true,
   "logging": true,
   "gameMode": 1,
   "generation": {
@@ -11,6 +11,7 @@
       "worldHeight":80
     }
   },
+  "kickTimeout":10000,
   "plugins": {
     
   },
diff --git a/src/lib/plugins/entities.js b/src/lib/plugins/entities.js
index cea20ca..36a8ffa 100644
--- a/src/lib/plugins/entities.js
+++ b/src/lib/plugins/entities.js
@@ -259,8 +259,7 @@ module.exports.entity=function(entity,serv){
 
   entity.collect = (collectEntity) => {
     if (entity.type != 'player'){
-      console.log('[ERROR] Non-player entity (type ' + entity.type + ') cannot collect another entity');
-      console.log((new Error()).stack);
+      serv.emit('error',new Error('[ERROR] Non-player entity (type ' + entity.type + ') cannot collect another entity'));
       return;
     }
     
diff --git a/src/lib/plugins/log.js b/src/lib/plugins/log.js
index 735e773..8b2251d 100644
--- a/src/lib/plugins/log.js
+++ b/src/lib/plugins/log.js
@@ -20,7 +20,7 @@ module.exports.server=function(serv,settings)
 
   serv.log = message => {
     message=moment().format('MMMM Do YYYY, HH:mm:ss')+" "+message;
-    console.log(message);
+    if(!settings.noConsoleOutput) console.log(message);
     if (!settings.logging) return;
     fs.appendFile(logFile, message + "\n", (err) => {
       if (err) console.log(err);
diff --git a/src/lib/plugins/modpe.js b/src/lib/plugins/modpe.js
index ad70f83..1aff257 100644
--- a/src/lib/plugins/modpe.js
+++ b/src/lib/plugins/modpe.js
@@ -9,10 +9,6 @@ function requireFromString(src, filename) {
   return m.exports;
 }
 
-function log(msg) {
-  console.log("[MODPE-NOINJECT] " + msg);
-}
-
 function modpeApi() {
   var Vec3 = null;
   var vec3 = null;
@@ -45,7 +41,6 @@ function modpeApi() {
   }
 
   function clientMessage(message) {
-    console.log(message);
     player.chat(message);
   }
 
@@ -104,7 +99,6 @@ function modpeApi() {
 }
 
 function convert(code) {
-  log("Started conversion...");
   var api = modpeApi.toString()
     .split("\n");
   api[0] = "";
@@ -116,8 +110,9 @@ function convert(code) {
 
 module.exports.server=function(serv,settings)
 {
+  var verboseMPE=false;
   function log(msg){
-    serv.log("[MPE]:  "+msg);
+    if(verboseMPE) serv.log("[MPE]:  "+msg);
   }
   if(!settings.modpe){
     log("Modpe support is not enabled, disabling injecting...");
@@ -164,7 +159,7 @@ module.exports.server=function(serv,settings)
       else if (packet.status == 2)
         destroyBlock(pos.x, pos.y, pos.z, 0);
       else if (packet.status == 1)
-        console.log("Unused in ModPE");
+      {/*Unused in ModPE*/}
       else if (packet.status == 0 && player.gameMode == 1)
         destroyBlock(pos.x, pos.y, pos.z, 0);
     });
@@ -185,7 +180,7 @@ module.exports.server=function(serv,settings)
         procCmd(command);
       }
       catch(err) {
-        console.log("MODPE error: "+err.stack);
+        serv.emit("error",err);
       }
     });
 
diff --git a/src/lib/plugins/world.js b/src/lib/plugins/world.js
index 1804d58..a54a58e 100644
--- a/src/lib/plugins/world.js
+++ b/src/lib/plugins/world.js
@@ -141,7 +141,6 @@ module.exports.player=function(player,serv) {
 
   player.sendSpawnPosition = () =>
   {
-    console.log("setting spawn at "+player.spawnPoint);
     player._client.write('spawn_position',{
       "location":player.spawnPoint
     });
diff --git a/test/mineflayer.js b/test/mineflayer.js
index b8285c3..111be6e 100644
--- a/test/mineflayer.js
+++ b/test/mineflayer.js
@@ -9,19 +9,9 @@ describe("Server with mineflayer connection", function() {
   var serv;
   var player;
   before(function(done){
-    var options = {
-      'motd': settings.motd,
-      'max-players': settings.maxPlayers,
-      'port': 25566,
-      'online-mode': false,
-      gameMode:settings.gameMode,
-      logging:settings.logging,
-      generation:settings.generation,
-      'modpe': settings.modpe,
-      kickTimeout: settings.kickTimeout ? settings.kickTimeout : 10*1000,
-      regionFolder: settings.regionFolder,
-      plugins: settings.plugins
-    };
+    var options = settings;
+    options["online-mode"]=false;
+    options["port"]=25566;
 
     serv=mcServer.createMCServer(options);
 
diff --git a/test/simple.js b/test/simple.js
index a6b36d6..9909073 100644
--- a/test/simple.js
+++ b/test/simple.js
@@ -1,14 +1,15 @@
 var net = require('net');
 describe("Server", function() {
+  var serv;
   before(function(done){
-    var serv=require("../app");
+    serv=require("../app");
     serv.on("listening",function(){
       done(null);
     })
   });
   it("Is running", function(done) {
     var client = net.Socket();
-    client.connect(25565, '127.0.0.1', done);
+    client.connect(serv._server.socketServer.address().port, '127.0.0.1', done);
     client.on('error', done);
   });
 });