3 files changed, 14 insertions, 12 deletions
diff --git a/bucky/app/bucky.js b/bucky/app/bucky.js
index 008427d..757592a 100644
--- a/bucky/app/bucky.js
+++ b/bucky/app/bucky.js
@@ -21,7 +21,9 @@ var bucky = module.exports = {
         lookup[c.thread] = c
       })
       res.threads.forEach(function(thread){
-        thread.set("comment_count", lookup[thread.id].count)
+        if (lookup[thread.id]) {
+          thread.set("comment_count", lookup[thread.id].count)
+        }
       })
       next()
     })
@@ -58,7 +60,7 @@ var bucky = module.exports = {
     })
   },
   ensureHootbox: function (req, res, next){
-    db.getCommentsForThread(1, 9, 0, "desc").then(function(hootbox){
+    db.getCommentsForThread(1, 15, 0, "desc").then(function(hootbox){
       res.hootbox = hootbox
       next()
     })
diff --git a/bucky/app/index.js b/bucky/app/index.js
index 2260cfe..03c5593 100644
--- a/bucky/app/index.js
+++ b/bucky/app/index.js
@@ -40,9 +40,9 @@ site.init = function(){
       type: 'mongodb',
       host: 'localhost',
       port: 27017,
-      dbName: 'sessionDb',
+      dbName: 'buckySessionDb',
       collectionName: 'sessions',
-      timeout: 10000
+      timeout: 10000,
     }),
     resave: true,
     saveUninitialized: false,
@@ -53,7 +53,7 @@ site.init = function(){
 	app.use(passport.initialize())
 	app.use(passport.session())
 
-  server = http.createServer(app).listen(5000, function () {
+  server = http.createServer(app).listen(process.env.PORT || 5000, function () {
     console.log('Bucky listening at http://5.k:%s', server.address().port)
   })
 
diff --git a/bucky/app/router.js b/bucky/app/router.js
index fe7d336..c3af565 100644
--- a/bucky/app/router.js
+++ b/bucky/app/router.js
@@ -1,8 +1,9 @@
-var auth = require('../util/auth')
-var middleware = require('../util/middleware')
-var fortune = require('../db/fortune')
-var bucky = require('../app/bucky')
-var util = require('../util/util')
+var auth = require('./auth')
+var middleware = require('./middleware')
+var fortune = require('./fortune')
+var bucky = require('./bucky')
+var db = require('./db')
+var util = require('./util')
 
 module.exports = function(app){
 	app.all('*', middleware.ensureLocals)
@@ -29,13 +30,13 @@ module.exports = function(app){
   
   app.post("/api/login", auth.loggedInLocal)
   app.get("/api/index",
+    bucky.ensureLastlog,
     middleware.ensureAuthenticated,
     bucky.ensureLatestThreads,
     bucky.ensureCommentCountsForThreads,
     bucky.ensureFileCountsForThreads,
     bucky.ensureKeywordsForThreads,
     bucky.ensureHootbox,
-    bucky.ensureLastlog,
     function(req, res){
       res.json({
         threads: res.threads,
@@ -69,7 +70,6 @@ module.exports = function(app){
     bucky.ensureThread,
     // ensure thread privacy
     bucky.createComment,
-    // add comments and files
     function(req, res){
       res.json({
         comment: res.comment