diff --git a/lib/config.coffee b/lib/config.coffee
index c7ebcd9..b46615f 100644
--- a/lib/config.coffee
+++ b/lib/config.coffee
@@ -32,6 +32,5 @@ exports.getTable = (callback) ->
   tabletop.init
     key: exports.gdoc_key
     simpleSheet: true
-    callback: (d,h) ->
-      callback d, h
+    callback: callback
 
diff --git a/live.coffee b/live.coffee
index 1d53f32..784c002 100644
--- a/live.coffee
+++ b/live.coffee
@@ -67,6 +67,12 @@ app = createApp
   generateStatistics: (cb) -> cb {}
   getLatest: (cb) -> cb {}
 
+app.all '/*', (req, res, next) ->
+  res.set "Access-Control-Allow-Origin", "*"
+  res.set "Access-Control-Allow-Headers", "X-Requested-With"
+  next()
+
+
 app.get '/votes', (req, res) ->
   if not req.query.event or not votemanager.events[req.query.event]?
     return res.jsonp 400,
@@ -84,7 +90,8 @@ app.get '/votes', (req, res) ->
       my_latest = new Date(row.sample)
       if my_latest > latest
         latest = my_latest
-    latest = latest.getTime()
+    if latest isnt null
+    	latest = latest.getTime()
     etag = "#{req.query.event}-#{length}-#{freq}-#{latest}"
     res.set
       'ETag': etag