diff --git a/lib/torque/provider.json.js b/lib/torque/provider.json.js
index c6e0932..81af4bf 100644
--- a/lib/torque/provider.json.js
+++ b/lib/torque/provider.json.js
@@ -264,8 +264,8 @@
 
     getKeySpan: function() {
       return {
-        start: this.options.start,
-        end: this.options.end,
+        start: this.options.start * 1000,
+        end: this.options.end * 1000,
         step: this.options.step,
         steps: this.options.steps
       };
@@ -316,7 +316,7 @@
     _fetchKeySpan: function() {
       var self = this;
       var max_col, min_col, max_tmpl, min_tmpl;
-      var query = format("with s as (select EXTRACT(EPOCH FROM max(updated_at)) as max FROM CDB_TableMetadata m WHERE m.tabname::name = any ( CDB_QueryTables('{sql}'))) select {column}, s.max as last_updated " + 
+      var query = format("with s as (select EXTRACT(EPOCH FROM max(updated_at)) as max FROM CDB_TableMetadata m WHERE m.tabname::name = any ( CDB_QueryTables('{sql}'))) select {column}, s.max as last_updated " +
                          "from s, ({sql}) __torque_wrap_sql limit 1", {
         column: this.options.column,
         sql: self.getSQL()
@@ -342,17 +342,17 @@
         min_col = format(min_tmpl, { column: self.options.column });
 
         /*var sql_stats = "" +
-        "WITH summary_groups as ( " + 
-          "WITH summary as ( " + 
-           "select   (row_number() over (order by __time_col asc nulls last)+1)/2 as rownum, __time_col " + 
-            "from (select *, {column} as __time_col from ({sql}) __s) __torque_wrap_sql " + 
-            "order by __time_col asc " + 
-          ") " + 
-          "SELECT " + 
-          "max(__time_col) OVER(PARTITION BY rownum) -  " + 
-          "min(__time_col) OVER(PARTITION BY rownum) diff " + 
-          "FROM summary " + 
-        "), subq as ( " + 
+        "WITH summary_groups as ( " +
+          "WITH summary as ( " +
+           "select   (row_number() over (order by __time_col asc nulls last)+1)/2 as rownum, __time_col " +
+            "from (select *, {column} as __time_col from ({sql}) __s) __torque_wrap_sql " +
+            "order by __time_col asc " +
+          ") " +
+          "SELECT " +
+          "max(__time_col) OVER(PARTITION BY rownum) -  " +
+          "min(__time_col) OVER(PARTITION BY rownum) diff " +
+          "FROM summary " +
+        "), subq as ( " +
         " SELECT " +
             "st_xmax(st_envelope(st_collect(the_geom))) xmax, " +
             "st_ymax(st_envelope(st_collect(the_geom))) ymax, " +
@@ -361,11 +361,11 @@
             "{max_col} max, " +
             "{min_col} min FROM  ({sql}) __torque_wrap_sql " +
         ")" +
-        "SELECT " + 
+        "SELECT " +
         "xmax, xmin, ymax, ymin, a.max as max_date, a.min as min_date, " +
-        "avg(diff) as diffavg," + 
-        "(a.max - a.min)/avg(diff) as num_steps " + 
-        "FROM summary_groups, subq a  " + 
+        "avg(diff) as diffavg," +
+        "(a.max - a.min)/avg(diff) as num_steps " +
+        "FROM summary_groups, subq a  " +
         "WHERE diff > 0 group by xmax, xmin, ymax, ymin, max_date, min_date";
         */
         var sql_stats = " SELECT " +
@@ -393,9 +393,9 @@
           self.options.data_steps = data.num_steps >> 0;
           // step can't be 0
           self.options.step = self.options.step || 1;
-          self.options.bounds = [ 
+          self.options.bounds = [
             [data.ymin, data.xmin],
-            [data.ymax, data.xmax] 
+            [data.ymax, data.xmax]
           ];
           self._setReady(true);
         }, { parseJSON: true });