diff --git a/app.js b/app.js
index 3c3471d..ca12e56 100644
--- a/app.js
+++ b/app.js
@@ -1,12 +1,13 @@
+require.paths.unshift(__dirname);
 require('coffee-script');
 
-require(__dirname+'/lib/server')(
+require('lib/server')(
     require('express'),
     require('stylus'),
     require('nib'),
     require('now'),
 
     // Injected Controllers
-    require(__dirname+'/lib/controllers/writeboard'),
-    require(__dirname+'/lib/controllers/room')
+    require('lib/controllers/writeboard'),
+    require('lib/controllers/room')
 );
\ No newline at end of file
diff --git a/lib/server.coffee b/lib/server.coffee
index 96361a1..5059238 100644
--- a/lib/server.coffee
+++ b/lib/server.coffee
@@ -12,11 +12,10 @@ module.exports = (express, stylus, nib, nowjs, controllers...) ->
     app.use express.bodyParser()
     app.use express.methodOverride()
     app.use app.router
-    app.use stylus.middleware src: "./public", compile: stylusCompiler
-    app.use express.compiler src: "./public", enable: ['coffeescript']
+    app.use stylus.middleware src: "#{__dirname}/public", compile: stylusCompiler
+    app.use express.compiler src: "#{__dirname}/public", enable: ['coffeescript']
     app.use express.static "#{__dirname}/public"
 
   controllers.forEach (controller) -> controller app, nowjs
 
-  app.listen 11071
-
+  app.listen process.env.app_port or 8080
\ No newline at end of file