diff --git a/lib/Server/Socket.js b/lib/Server/Socket.js
index c903dc8..36e117b 100644
--- a/lib/Server/Socket.js
+++ b/lib/Server/Socket.js
@@ -1,18 +1,21 @@
 define(['socket.io'], function(io) {
 
-	function Socket(server, coordinator) {
+	function Socket(server, options, coordinator) {
+        options.logLevel = typeof options.logLevel != 'undefined'
+            ? options.logLevel
+            : 0;
+        
 		this.coordinator = coordinator;
 		this.socket = io.listen(server);
 
-		this.init(server);
+		this.init(options);
 	}
 
-	Socket.prototype.init = function(){
+	Socket.prototype.init = function(options){
 
 		var self = this;
-
 		this.socket.configure('development', function(){
-			this.set('log level', 0);
+			this.set('log level', options.logLevel);
 		});
 
 		this.socket.on('connection', function(user){
@@ -26,4 +29,4 @@ define(['socket.io'], function(io) {
 
 	return Socket;
 	
-});
\ No newline at end of file
+});
diff --git a/server.js b/server.js
index 3be08d8..df57cf0 100644
--- a/server.js
+++ b/server.js
@@ -13,28 +13,24 @@ var requirements = [
 	"Server/Coordinator"
 ];	
 
+var port = process.argv[2] 
+	|| process.env.PORT 
+	|| process.env.npm_package_config_port;
+
 requirejs(requirements, function(HttpServer, Socket, Coordinator) {
 	
 	var options = {
-		port: process.env.npm_package_config_port, 
+		port: port, 
 		rootDirectory: './',
-		caching: false
+		caching: false,
+		logLevel: process.argv[3]
 	};
 
 	var coordinator = new Coordinator();
 	var httpServer = new HttpServer(options);
-	var socket = new Socket(httpServer.getServer(), coordinator);
+	var socket = new Socket(httpServer.getServer(), options, coordinator);
 
 	inspector.coordinator = coordinator;
 });
 
 exports = module.exports = inspector;
-
-/*
-belongs to channel.js
-var chuck;
-requirejs(["Chuck/Chuck"], function(Chuck) {
-	Chuck.init();
-	chuck = Chuck;
-});
-*/
\ No newline at end of file