diff --git a/deprecated/scatterChart.js b/deprecated/scatterChart.js
index 1517463..77dde1e 100644
--- a/deprecated/scatterChart.js
+++ b/deprecated/scatterChart.js
@@ -54,7 +54,7 @@ nv.models.scatterChart = function() {
           that = this;
 
       //TODO: decide if this makes sense to add into all the models for ease of updating (updating without needing the selection)
-      chart.update = function() { selection.transition().call(chart) };
+      chart.update = function() { container.transition().call(chart) };
 
 
       var availableWidth = (width  || parseInt(container.style('width')) || 960)
@@ -169,8 +169,8 @@ nv.models.scatterChart = function() {
             return d;
           });
         }
-
-        selection.transition().call(chart)
+        
+        chart.update();
       });
 
       /*
diff --git a/examples/legend.html b/examples/legend.html
index 3fb0a19..9802517 100644
--- a/examples/legend.html
+++ b/examples/legend.html
@@ -8,7 +8,7 @@
 
 <svg id="test1"></svg>
 
-<script src="../lib/d3.v2.js"></script>
+<script src="../lib/d3.v3.js"></script>
 <script src="../nv.d3.js"></script>
 <script src="../src/models/legend.js"></script>
 <script>
diff --git a/examples/line.html b/examples/line.html
index e775da3..1f401d3 100644
--- a/examples/line.html
+++ b/examples/line.html
@@ -12,7 +12,7 @@ body {
 
 <svg id="test1"></svg>
 
-<script src="../lib/d3.v2.js"></script>
+<script src="../lib/d3.v3.js"></script>
 <script src="../nv.d3.js"></script>
 <script src="../src/models/legend.js"></script>
 <script src="../src/models/line.js"></script>
diff --git a/examples/lineChart.html b/examples/lineChart.html
index ae7a97d..7f7dd72 100644
--- a/examples/lineChart.html
+++ b/examples/lineChart.html
@@ -36,7 +36,7 @@ svg {
     <svg style="height: 500px;"></svg>
   </div>
 
-<script src="../lib/d3.v2.js"></script>
+<script src="../lib/d3.v3.js"></script>
 <script src="../nv.d3.js"></script>
 <script src="../src/tooltip.js"></script>
 <script src="../src/utils.js"></script>
diff --git a/examples/lineChartSVGResize.html b/examples/lineChartSVGResize.html
index b3ae233..5e79e84 100644
--- a/examples/lineChartSVGResize.html
+++ b/examples/lineChartSVGResize.html
@@ -27,7 +27,7 @@ svg {
     <svg></svg>
   </div>
 
-<script src="../lib/d3.v2.js"></script>
+<script src="../lib/d3.v3.js"></script>
 <script src="../nv.d3.js"></script>
 <script src="../src/tooltip.js"></script>
 <script src="../src/utils.js"></script>
diff --git a/examples/linePlusBarChart.html b/examples/linePlusBarChart.html
index 28127da..b60758a 100644
--- a/examples/linePlusBarChart.html
+++ b/examples/linePlusBarChart.html
@@ -32,7 +32,7 @@ text {
     <svg> </svg>
   </div>
 
-<script src="../lib/d3.v2.js"></script>
+<script src="../lib/d3.v3.js"></script>
 <script src="../nv.d3.js"></script>
 <script src="../src/utils.js"></script>
 <script src="../src/tooltip.js"></script>
diff --git a/examples/linePlusBarWithFocusChart.html b/examples/linePlusBarWithFocusChart.html
index cf78269..7f05b45 100644
--- a/examples/linePlusBarWithFocusChart.html
+++ b/examples/linePlusBarWithFocusChart.html
@@ -32,7 +32,7 @@ text {
     <svg> </svg>
   </div>
 
-<script src="../lib/d3.v2.js"></script>
+<script src="../lib/d3.v3.js"></script>
 <script src="../nv.d3.js"></script>
 <script src="../src/utils.js"></script>
 <script src="../src/tooltip.js"></script>
diff --git a/examples/lineWithFisheyeChart.html b/examples/lineWithFisheyeChart.html
index 12d78b6..2830e29 100644
--- a/examples/lineWithFisheyeChart.html
+++ b/examples/lineWithFisheyeChart.html
@@ -36,7 +36,7 @@ svg {
     <svg style="height: 500px;"></svg>
   </div>
 
-<script src="../lib/d3.v2.js"></script>
+<script src="../lib/d3.v3.js"></script>
 <script src="../lib/fisheye.js"></script>
 <script src="../nv.d3.js"></script>
 <script src="../src/tooltip.js"></script>
diff --git a/examples/lineWithFocusChart.html b/examples/lineWithFocusChart.html
index 06bd19a..2ffdc7f 100644
--- a/examples/lineWithFocusChart.html
+++ b/examples/lineWithFocusChart.html
@@ -36,7 +36,7 @@ svg {
     <svg style="height: 500px;"></svg>
   </div>
 
-<script src="../lib/d3.v2.js"></script>
+<script src="../lib/d3.v3.js"></script>
 <script src="../nv.d3.js"></script>
 <script src="../src/tooltip.js"></script>
 <script src="../src/utils.js"></script>
diff --git a/examples/multiBar.html b/examples/multiBar.html
index 667c7e1..c7faf25 100644
--- a/examples/multiBar.html
+++ b/examples/multiBar.html
@@ -21,7 +21,7 @@ text {
     <svg></svg>
   </div>
 
-<script src="../lib/d3.v2.js"></script>
+<script src="../lib/d3.v3.js"></script>
 <script src="../nv.d3.js"></script>
 <script src="../src/tooltip.js"></script>
 <script src="../src/models/legend.js"></script>
diff --git a/examples/multiBarChart.html b/examples/multiBarChart.html
index 0289118..ce705ce 100644
--- a/examples/multiBarChart.html
+++ b/examples/multiBarChart.html
@@ -32,7 +32,7 @@ text {
     <svg></svg>
   </div>
 
-<script src="../lib/d3.v2.js"></script>
+<script src="../lib/d3.v3.js"></script>
 <script src="../nv.d3.js"></script>
 <script src="../src/tooltip.js"></script>
 <script src="../src/utils.js"></script>
diff --git a/examples/multiBarHorizontalChart.html b/examples/multiBarHorizontalChart.html
index 4245e4f..b948c55 100644
--- a/examples/multiBarHorizontalChart.html
+++ b/examples/multiBarHorizontalChart.html
@@ -35,7 +35,7 @@ text {
     <svg></svg>
   </div>
 
-<script src="../lib/d3.v2.js"></script>
+<script src="../lib/d3.v3.js"></script>
 <script src="../nv.d3.js"></script>
 <script src="../src/utils.js"></script>
 <script src="../src/tooltip.js"></script>
diff --git a/examples/multiChart.html b/examples/multiChart.html
index 5fc3525..1d5fff9 100644
--- a/examples/multiChart.html
+++ b/examples/multiChart.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<html>
 <meta charset="utf-8">
 
 <link href="../src/nv.d3.css" rel="stylesheet" type="text/css">
@@ -32,7 +33,7 @@ text {
     <svg> </svg>
   </div>
 
-<script src="../lib/d3.v2.js"></script>
+<script src="../lib/d3.v3.js"></script>
 <script src="../nv.d3.js"></script>
 <script src="../src/tooltip.js"></script>
 <script src="../src/models/legend.js"></script>
@@ -91,3 +92,4 @@ nv.addGraph(function() {
 });
 
 </script>
+</html>
\ No newline at end of file
diff --git a/examples/parallelCoordinates.html b/examples/parallelCoordinates.html
index 10fca6b..8dace04 100644
--- a/examples/parallelCoordinates.html
+++ b/examples/parallelCoordinates.html
@@ -1,11 +1,8 @@
 <!DOCTYPE html>
+<meta charset="utf-8">
 <html>
 <head>
 <link href="../src/nv.d3.css" rel="stylesheet" type="text/css">
-<script src="http://code.jquery.com/jquery-1.9.1.min.js"></script>>
-<script src="../lib/d3.v2.js"></script>
-<script src="../nv.d3.js"></script>
-<script type="text/javascript" src="../src/utils.js"></script>
 <style>
 
 body {
@@ -32,7 +29,9 @@ svg {
   <svg></svg>
 </div>
 
-
+<script type="text/javascript" src="../lib/d3.v3.js"></script>
+<script type="text/javascript" src="../nv.d3.js"></script>
+<script type="text/javascript" src="../src/utils.js"></script>
 <script type="text/javascript" src="../src/models/parallelCoordinates.js"></script>
 
 <script>
@@ -46,9 +45,9 @@ svg {
         .datum(data)
         .call(chart);
 
-    chart.dispatch.on('brush', function(e) {
-      nv.log(e);
-    });
+    // chart.dispatch.on('brush', function(e) {
+    //   nv.log(e);
+    // });
 
     nv.utils.windowResize(chart.update);
 
diff --git a/examples/pie.html b/examples/pie.html
index 0575027..1604fbd 100644
--- a/examples/pie.html
+++ b/examples/pie.html
@@ -18,7 +18,7 @@ text {
 
 <svg id="test2"></svg>
 
-<script src="../lib/d3.v2.js"></script>
+<script src="../lib/d3.v3.js"></script>
 <script src="../nv.d3.js"></script>
 <script src="../src/models/pie.js"></script>
 <script> 
diff --git a/examples/pieChart.html b/examples/pieChart.html
index 81453c3..11e77cb 100644
--- a/examples/pieChart.html
+++ b/examples/pieChart.html
@@ -24,7 +24,7 @@ text {
 <h2>Test2</h2>
 <svg id="test2" class="mypiechart"></svg>
 
-<script src="../lib/d3.v2.js"></script>
+<script src="../lib/d3.v3.js"></script>
 <script src="../nv.d3.js"></script>
 <script src="../src/models/legend.js"></script>
 <script src="../src/models/pie.js"></script>
diff --git a/examples/scatter.html b/examples/scatter.html
index 5765d42..3613cb0 100644
--- a/examples/scatter.html
+++ b/examples/scatter.html
@@ -12,7 +12,7 @@ body {
 
 <svg id="test1"></svg>
 
-<script src="../lib/d3.v2.js"></script>
+<script src="../lib/d3.v3.js"></script>
 <script src="../lib/fisheye.js"></script>
 <script src="../nv.d3.js"></script>
 <script src="../src/models/legend.js"></script>
diff --git a/examples/scatterChart.html b/examples/scatterChart.html
index abb0135..70e36a9 100644
--- a/examples/scatterChart.html
+++ b/examples/scatterChart.html
@@ -46,7 +46,7 @@ div {
   </div>
 </div>
 
-<script src="../lib/d3.v2.js"></script>
+<script src="../lib/d3.v3.js"></script>
 <!--<script src="../lib/fisheye.js"></script>-->
 <script src="../nv.d3.js"></script>
 <script src="../src/tooltip.js"></script>
diff --git a/examples/scatterPlusLineChart.html b/examples/scatterPlusLineChart.html
index d558d7d..0d41f06 100644
--- a/examples/scatterPlusLineChart.html
+++ b/examples/scatterPlusLineChart.html
@@ -46,7 +46,7 @@ div {
   </div>
 </div>
 
-<script src="../lib/d3.v2.js"></script>
+<script src="../lib/d3.v3.js"></script>
 <script src="../lib/fisheye.js"></script>
 <script src="../nv.d3.js"></script>
 <script src="../src/tooltip.js"></script>
diff --git a/examples/sparkline.html b/examples/sparkline.html
index 439fb23..b7412ec 100644
--- a/examples/sparkline.html
+++ b/examples/sparkline.html
@@ -22,7 +22,7 @@ text {
 
   <h2>Sparkline: <svg id="chart1" class="sparkline"></svg></h2>
 
-<script src="../lib/d3.v2.js"></script>
+<script src="../lib/d3.v3.js"></script>
 <script src="../nv.d3.js"></script>
 <script src="../src/models/sparkline.js"></script>
 <script src="../src/utils.js"></script>
diff --git a/examples/sparklinePlus.html b/examples/sparklinePlus.html
index fc8d866..7a342c7 100644
--- a/examples/sparklinePlus.html
+++ b/examples/sparklinePlus.html
@@ -20,7 +20,7 @@ h2, p {
 <h2>SparklinePlus:</h2>
 <p><svg id="chart1" class="sparkline"></svg></p>
 
-<script src="../lib/d3.v2.js"></script>
+<script src="../lib/d3.v3.js"></script>
 <script src="../nv.d3.js"></script>
 <script src="../src/utils.js"></script>
 <script src="../src/models/sparkline.js"></script>
diff --git a/examples/stackedArea.html b/examples/stackedArea.html
index 22ea374..70df476 100644
--- a/examples/stackedArea.html
+++ b/examples/stackedArea.html
@@ -20,7 +20,7 @@ text {
     <svg></svg>
   </div>
 
-<script src="../lib/d3.v2.js"></script>
+<script src="../lib/d3.v3.js"></script>
 <script src="../nv.d3.js"></script>
 <script src="../src/tooltip.js"></script>
 <script src="../src/models/stackedArea.js"></script>
diff --git a/examples/stackedAreaChart.html b/examples/stackedAreaChart.html
index a681f6c..0e57e40 100644
--- a/examples/stackedAreaChart.html
+++ b/examples/stackedAreaChart.html
@@ -28,7 +28,7 @@ text {
     <!--<svg id="chart2"></svg>-->
   </div>
 
-<script src="../lib/d3.v2.js"></script>
+<script src="../lib/d3.v3.js"></script>
 <script src="../nv.d3.js"></script>
 <script src="../src/utils.js"></script>
 <script src="../src/models/axis.js"></script>
diff --git a/nv.d3.js b/nv.d3.js
index a83aaa8..57022e7 100644
--- a/nv.d3.js
+++ b/nv.d3.js
@@ -648,7 +648,7 @@ nv.models.axis = function() {
 
       //highlight zero line ... Maybe should not be an option and should just be in CSS?
       if (highlightZero)
-        g.selectAll('line.tick')
+        g.selectAll('.tick')
           .filter(function(d) { return !parseFloat(Math.round(d*100000)/1000000) }) //this is because sometimes the 0 tick is a very small fraction, TODO: think of cleaner technique
             .classed('zero', true);
 
@@ -3171,18 +3171,18 @@ nv.models.indentedTree = function() {
 
   //============================================================
 
+  var idx = 0;
 
   function chart(selection) {
     selection.each(function(data) {
-      var i = 0,
-          depth = 1;
+      var depth = 1,
+          container = d3.select(this);
 
       var tree = d3.layout.tree()
           .children(function(d) { return d.values })
           .size([height, childIndent]); //Not sure if this is needed now that the result is HTML
 
-      chart.update = function() { selection.transition().call(chart) };
-      chart.container = this;
+      chart.update = function() { container.transition().duration(600).call(chart) };
 
 
       //------------------------------------------------------------
@@ -3194,6 +3194,10 @@ nv.models.indentedTree = function() {
 
       var nodes = tree.nodes(data[0]);
 
+      // nodes.map(function(d) {
+      //   d.id = i++;
+      // })
+
       //------------------------------------------------------------
       // Setup containers and skeleton of chart
 
@@ -3234,12 +3238,12 @@ nv.models.indentedTree = function() {
 
       // Update the nodes…
       var node = tbody.selectAll('tr')
-          .data(function(d) { return d.filter(function(d) { return (filterZero && !d.children) ? filterZero(d) :  true; }) }, function(d) { return d.id || (d.id == ++i)});
+          // .data(function(d) { return d; }, function(d) { return d.id || (d.id == ++i)});
+          .data(function(d) { return d.filter(function(d) { return (filterZero && !d.children) ? filterZero(d) :  true; } )}, function(d,i) { return d.id || (d.id || ++idx)});
           //.style('display', 'table-row'); //TODO: see if this does anything
 
       node.exit().remove();
 
-
       node.select('img.nv-treeicon')
           .attr('src', icon)
           .classed('folded', folded);
@@ -3290,7 +3294,6 @@ nv.models.indentedTree = function() {
 
       });
 
-
       node
         .order()
         .on('click', function(d) { 
@@ -3807,9 +3810,9 @@ nv.models.line = function() {
             return d3.svg.area()
                 .interpolate(interpolate)
                 .defined(defined)
-                .x(function(d,i) { return x0(getX(d,i)) })
-                .y0(function(d,i) { return y0(getY(d,i)) })
-                .y1(function(d,i) { return y0( y.domain()[0] <= 0 ? y.domain()[1] >= 0 ? 0 : y.domain()[1] : y.domain()[0] ) })
+                .x(function(d,i) { return x(getX(d,i)) })
+                .y0(function(d,i) { return y(getY(d,i)) })
+                .y1(function(d,i) { return y( y.domain()[0] <= 0 ? y.domain()[1] >= 0 ? 0 : y.domain()[1] : y.domain()[0] ) })
                 //.y1(function(d,i) { return y0(0) }) //assuming 0 is within y domain.. may need to tweak this
                 .apply(this, [d.values])
           });
@@ -3818,9 +3821,9 @@ nv.models.line = function() {
             return d3.svg.area()
                 .interpolate(interpolate)
                 .defined(defined)
-                .x(function(d,i) { return x0(getX(d,i)) })
-                .y0(function(d,i) { return y0(getY(d,i)) })
-                .y1(function(d,i) { return y0( y.domain()[0] <= 0 ? y.domain()[1] >= 0 ? 0 : y.domain()[1] : y.domain()[0] ) })
+                .x(function(d,i) { return x(getX(d,i)) })
+                .y0(function(d,i) { return y(getY(d,i)) })
+                .y1(function(d,i) { return y( y.domain()[0] <= 0 ? y.domain()[1] >= 0 ? 0 : y.domain()[1] : y.domain()[0] ) })
                 //.y1(function(d,i) { return y0(0) }) //assuming 0 is within y domain.. may need to tweak this
                 .apply(this, [d.values])
           });
@@ -4031,7 +4034,7 @@ nv.models.lineChart = function() {
                              - margin.top - margin.bottom;
 
 
-      chart.update = function() { chart(selection) };
+      chart.update = function() { container.transition().call(chart) };
       chart.container = this;
 
       //set state.disabled
@@ -4183,7 +4186,8 @@ nv.models.lineChart = function() {
         state.disabled = data.map(function(d) { return !!d.disabled });
         dispatch.stateChange(state);
 
-        selection.transition().call(chart);
+        // container.transition().call(chart);
+        chart.update();
       });
 
 /*
@@ -4413,7 +4417,7 @@ nv.models.linePlusBarChart = function() {
           availableHeight = (height || parseInt(container.style('height')) || 400)
                              - margin.top - margin.bottom;
 
-      chart.update = function() { chart(selection) };
+      chart.update = function() { container.transition().call(chart); };
       chart.container = this;
 
       //set state.disabled
@@ -4606,7 +4610,7 @@ nv.models.linePlusBarChart = function() {
         state.disabled = data.map(function(d) { return !!d.disabled });
         dispatch.stateChange(state);
 
-        selection.transition().call(chart);
+        chart.update();
       });
 
       dispatch.on('tooltipShow', function(e) {
@@ -4857,7 +4861,7 @@ nv.models.lineWithFocusChart = function() {
                              - margin.top - margin.bottom - height2,
           availableHeight2 = height2 - margin2.top - margin2.bottom;
 
-      chart.update = function() { chart(selection) };
+      chart.update = function() { container.transition().call(chart) };
       chart.container = this;
 
 
@@ -5096,7 +5100,7 @@ nv.models.lineWithFocusChart = function() {
           });
         }
 
-        selection.transition().call(chart);
+        container.transition().call(chart);
       });
 
       dispatch.on('tooltipShow', function(e) {
@@ -5437,7 +5441,7 @@ nv.models.linePlusBarWithFocusChart = function() {
                              - margin.top - margin.bottom - height2,
           availableHeight2 = height2 - margin2.top - margin2.bottom;
 
-      chart.update = function() { chart(selection) };
+      chart.update = function() { container.transition().call(chart); };
       chart.container = this;
 
 
@@ -5686,7 +5690,7 @@ nv.models.linePlusBarWithFocusChart = function() {
           });
         }
 
-        selection.call(chart);
+        chart.update();
       });
 
       dispatch.on('tooltipShow', function(e) {
@@ -6016,6 +6020,7 @@ nv.models.multiBar = function() {
     , barColor = null // adding the ability to set the color for each rather than the whole group
     , disabled // used in conjunction with barColor to communicate from multiBarHorizontalChart what series are disabled
     , delay = 1200
+    , drawTime = 500
     , xDomain
     , yDomain
     , dispatch = d3.dispatch('chartClick', 'elementClick', 'elementDblClick', 'elementMouseover', 'elementMouseout')
@@ -6256,7 +6261,7 @@ nv.models.multiBar = function() {
 
 
       if (stacked)
-        d3.transition(bars)
+        d3.transition(bars).duration(drawTime)
             .delay(function(d,i) { return i * delay / data[0].values.length })
             .attr('y', function(d,i) {
 
@@ -6266,21 +6271,21 @@ nv.models.multiBar = function() {
               return Math.max(Math.abs(y(d.y + (stacked ? d.y0 : 0)) - y((stacked ? d.y0 : 0))),1);
             })
             .each('end', function() {
-              d3.transition(d3.select(this))
+              d3.select(this).transition().duration(drawTime)
                 .attr('x', function(d,i) {
                   return stacked ? 0 : (d.series * x.rangeBand() / data.length )
                 })
                 .attr('width', x.rangeBand() / (stacked ? 1 : data.length) );
             })
       else
-        d3.transition(bars)
+        d3.transition(bars).duration(drawTime)
           .delay(function(d,i) { return i * delay/ data[0].values.length })
             .attr('x', function(d,i) {
               return d.series * x.rangeBand() / data.length
             })
             .attr('width', x.rangeBand() / data.length)
             .each('end', function() {
-              d3.transition(d3.select(this))
+              d3.select(this).transition().duration(drawTime)
                 .attr('y', function(d,i) {
                   return getY(d,i) < 0 ?
                           y(0) :
@@ -6421,6 +6426,12 @@ nv.models.multiBar = function() {
     return chart;
   };
 
+  chart.drawTime = function(_) {
+    if (!arguments.length) return drawTime;
+    drawTime = _;
+    return chart;
+  };
+
   //============================================================
 
 
@@ -6468,7 +6479,7 @@ nv.models.multiBarChart = function() {
   xAxis
     .orient('bottom')
     .tickPadding(7)
-    .highlightZero(false)
+    .highlightZero(true)
     .showMaxMin(false)
     .tickFormat(function(d) { return d })
     ;
@@ -6507,7 +6518,7 @@ nv.models.multiBarChart = function() {
           availableHeight = (height || parseInt(container.style('height')) || 400)
                              - margin.top - margin.bottom;
 
-      chart.update = function() { selection.transition().call(chart) };
+      chart.update = function() { container.transition().call(chart) };
       chart.container = this;
 
       //set state.disabled
@@ -6708,7 +6719,7 @@ nv.models.multiBarChart = function() {
         state.disabled = data.map(function(d) { return !!d.disabled });
         dispatch.stateChange(state);
 
-        selection.transition().call(chart);
+        chart.update();
       });
 
       controls.dispatch.on('legendClick', function(d,i) {
@@ -6731,7 +6742,7 @@ nv.models.multiBarChart = function() {
         state.stacked = multibar.stacked();
         dispatch.stateChange(state);
 
-        selection.transition().call(chart);
+        chart.update();
       });
 
       dispatch.on('tooltipShow', function(e) {
@@ -7391,7 +7402,7 @@ nv.models.multiBarHorizontalChart = function() {
           availableHeight = (height || parseInt(container.style('height')) || 400)
                              - margin.top - margin.bottom;
 
-      chart.update = function() { selection.transition().call(chart) };
+      chart.update = function() { container.transition().call(chart) };
       chart.container = this;
 
       //set state.disabled
@@ -7577,7 +7588,7 @@ nv.models.multiBarHorizontalChart = function() {
         state.disabled = data.map(function(d) { return !!d.disabled });
         dispatch.stateChange(state);
 
-        selection.transition().call(chart);
+        chart.update();
       });
 
       controls.dispatch.on('legendClick', function(d,i) {
@@ -7600,7 +7611,7 @@ nv.models.multiBarHorizontalChart = function() {
         state.stacked = multibar.stacked();
         dispatch.stateChange(state);
 
-        selection.transition().call(chart);
+        chart.update();
       });
 
       dispatch.on('tooltipShow', function(e) {
@@ -7804,6 +7815,9 @@ nv.models.multiChart = function() {
       var container = d3.select(this),
           that = this;
 
+      chart.update = function() { container.transition().call(chart); };
+      chart.container = this;
+
       var availableWidth = (width  || parseInt(container.style('width')) || 960)
                              - margin.left - margin.right,
           availableHeight = (height || parseInt(container.style('height')) || 400)
@@ -8002,7 +8016,7 @@ nv.models.multiChart = function() {
             return d;
           });
         }
-        selection.transition().call(chart);
+        chart.update();
       });
 
       dispatch.on('tooltipShow', function(e) {
@@ -8011,9 +8025,6 @@ nv.models.multiChart = function() {
 
     });
 
-    chart.update = function() { chart(selection) };
-    chart.container = this;
-
     return chart;
   }
 
@@ -8996,7 +9007,7 @@ nv.models.pieChart = function() {
           availableHeight = (height || parseInt(container.style('height')) || 400)
                              - margin.top - margin.bottom;
 
-      chart.update = function() { chart(selection); };
+      chart.update = function() { container.transition().call(chart); };
       chart.container = this;
 
       //set state.disabled
@@ -9112,7 +9123,7 @@ nv.models.pieChart = function() {
         state.disabled = data[0].map(function(d) { return !!d.disabled });
         dispatch.stateChange(state);
 
-        selection.transition().call(chart)
+        chart.update();
       });
 
       pie.dispatch.on('elementMouseout.tooltip', function(e) {
@@ -9130,7 +9141,7 @@ nv.models.pieChart = function() {
           state.disabled = e.disabled;
         }
 
-        selection.call(chart);
+        chart.update();
       });
 
       //============================================================
@@ -9973,7 +9984,7 @@ nv.models.scatterChart = function() {
           availableHeight = (height || parseInt(container.style('height')) || 400)
                              - margin.top - margin.bottom;
 
-      chart.update = function() { chart(selection) };
+      chart.update = function() { container.transition().call(chart); };
       chart.container = this;
 
       //set state.disabled
@@ -10234,7 +10245,7 @@ nv.models.scatterChart = function() {
           pauseFisheye = false;
         }
 
-        chart(selection);
+        chart.update();
       });
 
       legend.dispatch.on('legendClick', function(d,i, that) {
@@ -10251,7 +10262,7 @@ nv.models.scatterChart = function() {
         state.disabled = data.map(function(d) { return !!d.disabled });
         dispatch.stateChange(state);
 
-        chart(selection);
+        chart.update();
       });
 
       /*
@@ -10567,7 +10578,7 @@ nv.models.scatterPlusLineChart = function() {
           availableHeight = (height || parseInt(container.style('height')) || 400)
                              - margin.top - margin.bottom;
 
-      chart.update = function() { chart(selection) };
+      chart.update = function() { container.transition().call(chart); };
       chart.container = this;
 
       //set state.disabled
@@ -10843,7 +10854,7 @@ nv.models.scatterPlusLineChart = function() {
           pauseFisheye = false;
         }
 
-        chart(selection);
+        chart.update();
       });
 
       legend.dispatch.on('legendClick', function(d,i, that) {
@@ -10860,7 +10871,7 @@ nv.models.scatterPlusLineChart = function() {
         state.disabled = data.map(function(d) { return !!d.disabled });
         dispatch.stateChange(state);
 
-        chart(selection);
+        chart.update();
       });
 
       /*
@@ -10900,7 +10911,7 @@ nv.models.scatterPlusLineChart = function() {
           state.disabled = e.disabled;
         }
 
-        selection.call(chart);
+        chart.update();
       });
 
       //============================================================
@@ -11944,7 +11955,7 @@ nv.models.stackedAreaChart = function() {
           availableHeight = (height || parseInt(container.style('height')) || 400)
                              - margin.top - margin.bottom;
 
-      chart.update = function() { chart(selection) };
+      chart.update = function() { container.transition().call(chart); };
       chart.container = this;
 
       //set state.disabled
@@ -12134,7 +12145,7 @@ nv.models.stackedAreaChart = function() {
         dispatch.stateChange(state);
 
         //selection.transition().call(chart);
-        chart(selection);
+        chart.update();
       });
 
       legend.dispatch.on('legendClick', function(d,i) {
@@ -12151,7 +12162,7 @@ nv.models.stackedAreaChart = function() {
         dispatch.stateChange(state);
 
         //selection.transition().call(chart);
-        chart(selection);
+        chart.update();
       });
 
       controls.dispatch.on('legendClick', function(d,i) {
@@ -12179,7 +12190,7 @@ nv.models.stackedAreaChart = function() {
         dispatch.stateChange(state);
 
         //selection.transition().call(chart);
-        chart(selection);
+        chart.update();
       });
 
       dispatch.on('tooltipShow', function(e) {
@@ -12201,7 +12212,7 @@ nv.models.stackedAreaChart = function() {
           stacked.style(e.style);
         }
 
-        selection.call(chart);
+        chart.update();
       });
 
     });
diff --git a/src/models/axis.js b/src/models/axis.js
index 7f2b039..6fbdcc2 100644
--- a/src/models/axis.js
+++ b/src/models/axis.js
@@ -295,7 +295,7 @@ nv.models.axis = function() {
 
       //highlight zero line ... Maybe should not be an option and should just be in CSS?
       if (highlightZero)
-        g.selectAll('line.tick')
+        g.selectAll('.tick')
           .filter(function(d) { return !parseFloat(Math.round(d*100000)/1000000) }) //this is because sometimes the 0 tick is a very small fraction, TODO: think of cleaner technique
             .classed('zero', true);
 
diff --git a/src/models/indentedTree.js b/src/models/indentedTree.js
index eec18b6..f2084b9 100644
--- a/src/models/indentedTree.js
+++ b/src/models/indentedTree.js
@@ -22,11 +22,11 @@ nv.models.indentedTree = function() {
 
   //============================================================
 
+  var idx = 0;
 
   function chart(selection) {
     selection.each(function(data) {
-      var i = 0,
-          depth = 1,
+      var depth = 1,
           container = d3.select(this);
 
       var tree = d3.layout.tree()
@@ -45,6 +45,10 @@ nv.models.indentedTree = function() {
 
       var nodes = tree.nodes(data[0]);
 
+      // nodes.map(function(d) {
+      //   d.id = i++;
+      // })
+
       //------------------------------------------------------------
       // Setup containers and skeleton of chart
 
@@ -85,12 +89,12 @@ nv.models.indentedTree = function() {
 
       // Update the nodes…
       var node = tbody.selectAll('tr')
-          .data(function(d) { return d.filter(function(d) { return (filterZero && !d.children) ? filterZero(d) :  true; }) }, function(d) { return d.id || (d.id == ++i)});
+          // .data(function(d) { return d; }, function(d) { return d.id || (d.id == ++i)});
+          .data(function(d) { return d.filter(function(d) { return (filterZero && !d.children) ? filterZero(d) :  true; } )}, function(d,i) { return d.id || (d.id || ++idx)});
           //.style('display', 'table-row'); //TODO: see if this does anything
 
       node.exit().remove();
 
-
       node.select('img.nv-treeicon')
           .attr('src', icon)
           .classed('folded', folded);
@@ -141,7 +145,6 @@ nv.models.indentedTree = function() {
 
       });
 
-
       node
         .order()
         .on('click', function(d) { 
diff --git a/src/models/line.js b/src/models/line.js
index 4ae68d8..a48169b 100644
--- a/src/models/line.js
+++ b/src/models/line.js
@@ -142,9 +142,9 @@ nv.models.line = function() {
             return d3.svg.area()
                 .interpolate(interpolate)
                 .defined(defined)
-                .x(function(d,i) { return x0(getX(d,i)) })
-                .y0(function(d,i) { return y0(getY(d,i)) })
-                .y1(function(d,i) { return y0( y.domain()[0] <= 0 ? y.domain()[1] >= 0 ? 0 : y.domain()[1] : y.domain()[0] ) })
+                .x(function(d,i) { return x(getX(d,i)) })
+                .y0(function(d,i) { return y(getY(d,i)) })
+                .y1(function(d,i) { return y( y.domain()[0] <= 0 ? y.domain()[1] >= 0 ? 0 : y.domain()[1] : y.domain()[0] ) })
                 //.y1(function(d,i) { return y0(0) }) //assuming 0 is within y domain.. may need to tweak this
                 .apply(this, [d.values])
           });
@@ -153,9 +153,9 @@ nv.models.line = function() {
             return d3.svg.area()
                 .interpolate(interpolate)
                 .defined(defined)
-                .x(function(d,i) { return x0(getX(d,i)) })
-                .y0(function(d,i) { return y0(getY(d,i)) })
-                .y1(function(d,i) { return y0( y.domain()[0] <= 0 ? y.domain()[1] >= 0 ? 0 : y.domain()[1] : y.domain()[0] ) })
+                .x(function(d,i) { return x(getX(d,i)) })
+                .y0(function(d,i) { return y(getY(d,i)) })
+                .y1(function(d,i) { return y( y.domain()[0] <= 0 ? y.domain()[1] >= 0 ? 0 : y.domain()[1] : y.domain()[0] ) })
                 //.y1(function(d,i) { return y0(0) }) //assuming 0 is within y domain.. may need to tweak this
                 .apply(this, [d.values])
           });
diff --git a/src/models/lineChart.js b/src/models/lineChart.js
index f72012c..bcb000b 100644
--- a/src/models/lineChart.js
+++ b/src/models/lineChart.js
@@ -82,7 +82,7 @@ nv.models.lineChart = function() {
                              - margin.top - margin.bottom;
 
 
-      chart.update = function() { chart(selection) };
+      chart.update = function() { container.transition().call(chart) };
       chart.container = this;
 
       //set state.disabled
@@ -234,7 +234,8 @@ nv.models.lineChart = function() {
         state.disabled = data.map(function(d) { return !!d.disabled });
         dispatch.stateChange(state);
 
-        selection.transition().call(chart);
+        // container.transition().call(chart);
+        chart.update();
       });
 
 /*
diff --git a/src/models/linePlusBarChart.js b/src/models/linePlusBarChart.js
index 91f1db7..6b4645e 100644
--- a/src/models/linePlusBarChart.js
+++ b/src/models/linePlusBarChart.js
@@ -85,7 +85,7 @@ nv.models.linePlusBarChart = function() {
           availableHeight = (height || parseInt(container.style('height')) || 400)
                              - margin.top - margin.bottom;
 
-      chart.update = function() { chart(selection) };
+      chart.update = function() { container.transition().call(chart); };
       chart.container = this;
 
       //set state.disabled
@@ -278,7 +278,7 @@ nv.models.linePlusBarChart = function() {
         state.disabled = data.map(function(d) { return !!d.disabled });
         dispatch.stateChange(state);
 
-        selection.transition().call(chart);
+        chart.update();
       });
 
       dispatch.on('tooltipShow', function(e) {
diff --git a/src/models/linePlusBarWithFocusChart.js b/src/models/linePlusBarWithFocusChart.js
index 0199bfb..8688143 100644
--- a/src/models/linePlusBarWithFocusChart.js
+++ b/src/models/linePlusBarWithFocusChart.js
@@ -107,7 +107,7 @@ nv.models.linePlusBarWithFocusChart = function() {
                              - margin.top - margin.bottom - height2,
           availableHeight2 = height2 - margin2.top - margin2.bottom;
 
-      chart.update = function() { chart(selection) };
+      chart.update = function() { container.transition().call(chart); };
       chart.container = this;
 
 
@@ -356,7 +356,7 @@ nv.models.linePlusBarWithFocusChart = function() {
           });
         }
 
-        selection.call(chart);
+        chart.update();
       });
 
       dispatch.on('tooltipShow', function(e) {
diff --git a/src/models/lineWithFisheyeChart.js b/src/models/lineWithFisheyeChart.js
index 0d315be..59e851c 100644
--- a/src/models/lineWithFisheyeChart.js
+++ b/src/models/lineWithFisheyeChart.js
@@ -55,7 +55,8 @@ nv.models.lineChart = function() {
           availableHeight = (height || parseInt(container.style('height')) || 400)
                              - margin.top - margin.bottom;
 
-
+    chart.update = function() { container.transition().call(chart) };
+    chart.container = this; // I need a reference to the container in order to have outside code check if the chart is visible or not
       //------------------------------------------------------------
       // Display No Data message if there's nothing to show.
 
@@ -207,7 +208,7 @@ nv.models.lineChart = function() {
           pauseFisheye = false;
         }
 
-        selection.transition().call(chart);
+        chart.update();
       });
 
 
@@ -223,7 +224,7 @@ nv.models.lineChart = function() {
           });
         }
 
-        selection.transition().call(chart);
+        chart.update();
       });
 
 /*
@@ -252,12 +253,6 @@ nv.models.lineChart = function() {
 
     });
 
-
-    //TODO: decide if this is a good idea, and if it should be in all models
-    chart.update = function() { chart(selection) };
-    chart.container = this; // I need a reference to the container in order to have outside code check if the chart is visible or not
-
-
     return chart;
   }
 
diff --git a/src/models/multiBar.js b/src/models/multiBar.js
index fac6703..152c433 100644
--- a/src/models/multiBar.js
+++ b/src/models/multiBar.js
@@ -21,6 +21,7 @@ nv.models.multiBar = function() {
     , barColor = null // adding the ability to set the color for each rather than the whole group
     , disabled // used in conjunction with barColor to communicate from multiBarHorizontalChart what series are disabled
     , delay = 1200
+    , drawTime = 500
     , xDomain
     , yDomain
     , dispatch = d3.dispatch('chartClick', 'elementClick', 'elementDblClick', 'elementMouseover', 'elementMouseout')
@@ -261,7 +262,7 @@ nv.models.multiBar = function() {
 
 
       if (stacked)
-        d3.transition(bars)
+        d3.transition(bars).duration(drawTime)
             .delay(function(d,i) { return i * delay / data[0].values.length })
             .attr('y', function(d,i) {
 
@@ -271,21 +272,21 @@ nv.models.multiBar = function() {
               return Math.max(Math.abs(y(d.y + (stacked ? d.y0 : 0)) - y((stacked ? d.y0 : 0))),1);
             })
             .each('end', function() {
-              d3.transition(d3.select(this))
+              d3.select(this).transition().duration(drawTime)
                 .attr('x', function(d,i) {
                   return stacked ? 0 : (d.series * x.rangeBand() / data.length )
                 })
                 .attr('width', x.rangeBand() / (stacked ? 1 : data.length) );
             })
       else
-        d3.transition(bars)
+        d3.transition(bars).duration(drawTime)
           .delay(function(d,i) { return i * delay/ data[0].values.length })
             .attr('x', function(d,i) {
               return d.series * x.rangeBand() / data.length
             })
             .attr('width', x.rangeBand() / data.length)
             .each('end', function() {
-              d3.transition(d3.select(this))
+              d3.select(this).transition().duration(drawTime)
                 .attr('y', function(d,i) {
                   return getY(d,i) < 0 ?
                           y(0) :
@@ -426,6 +427,12 @@ nv.models.multiBar = function() {
     return chart;
   };
 
+  chart.drawTime = function(_) {
+    if (!arguments.length) return drawTime;
+    drawTime = _;
+    return chart;
+  };
+
   //============================================================
 
 
diff --git a/src/models/multiBarChart.js b/src/models/multiBarChart.js
index 66cc5d2..5ceaa60 100644
--- a/src/models/multiBarChart.js
+++ b/src/models/multiBarChart.js
@@ -40,7 +40,7 @@ nv.models.multiBarChart = function() {
   xAxis
     .orient('bottom')
     .tickPadding(7)
-    .highlightZero(false)
+    .highlightZero(true)
     .showMaxMin(false)
     .tickFormat(function(d) { return d })
     ;
@@ -79,7 +79,7 @@ nv.models.multiBarChart = function() {
           availableHeight = (height || parseInt(container.style('height')) || 400)
                              - margin.top - margin.bottom;
 
-      chart.update = function() { selection.transition().call(chart) };
+      chart.update = function() { container.transition().call(chart) };
       chart.container = this;
 
       //set state.disabled
@@ -280,7 +280,7 @@ nv.models.multiBarChart = function() {
         state.disabled = data.map(function(d) { return !!d.disabled });
         dispatch.stateChange(state);
 
-        selection.transition().call(chart);
+        chart.update();
       });
 
       controls.dispatch.on('legendClick', function(d,i) {
@@ -303,7 +303,7 @@ nv.models.multiBarChart = function() {
         state.stacked = multibar.stacked();
         dispatch.stateChange(state);
 
-        selection.transition().call(chart);
+        chart.update();
       });
 
       dispatch.on('tooltipShow', function(e) {
diff --git a/src/models/multiBarHorizontalChart.js b/src/models/multiBarHorizontalChart.js
index 1d9ff3f..c8ff92c 100644
--- a/src/models/multiBarHorizontalChart.js
+++ b/src/models/multiBarHorizontalChart.js
@@ -78,7 +78,7 @@ nv.models.multiBarHorizontalChart = function() {
           availableHeight = (height || parseInt(container.style('height')) || 400)
                              - margin.top - margin.bottom;
 
-      chart.update = function() { selection.transition().call(chart) };
+      chart.update = function() { container.transition().call(chart) };
       chart.container = this;
 
       //set state.disabled
@@ -264,7 +264,7 @@ nv.models.multiBarHorizontalChart = function() {
         state.disabled = data.map(function(d) { return !!d.disabled });
         dispatch.stateChange(state);
 
-        selection.transition().call(chart);
+        chart.update();
       });
 
       controls.dispatch.on('legendClick', function(d,i) {
@@ -287,7 +287,7 @@ nv.models.multiBarHorizontalChart = function() {
         state.stacked = multibar.stacked();
         dispatch.stateChange(state);
 
-        selection.transition().call(chart);
+        chart.update();
       });
 
       dispatch.on('tooltipShow', function(e) {
diff --git a/src/models/multiChart.js b/src/models/multiChart.js
index fdfe24d..58f6f99 100644
--- a/src/models/multiChart.js
+++ b/src/models/multiChart.js
@@ -55,6 +55,9 @@ nv.models.multiChart = function() {
       var container = d3.select(this),
           that = this;
 
+      chart.update = function() { container.transition().call(chart); };
+      chart.container = this;
+
       var availableWidth = (width  || parseInt(container.style('width')) || 960)
                              - margin.left - margin.right,
           availableHeight = (height || parseInt(container.style('height')) || 400)
@@ -253,7 +256,7 @@ nv.models.multiChart = function() {
             return d;
           });
         }
-        selection.transition().call(chart);
+        chart.update();
       });
 
       dispatch.on('tooltipShow', function(e) {
@@ -262,9 +265,6 @@ nv.models.multiChart = function() {
 
     });
 
-    chart.update = function() { chart(selection) };
-    chart.container = this;
-
     return chart;
   }
 
diff --git a/src/models/pieChart.js b/src/models/pieChart.js
index c93498d..2cc1c5a 100644
--- a/src/models/pieChart.js
+++ b/src/models/pieChart.js
@@ -54,7 +54,7 @@ nv.models.pieChart = function() {
           availableHeight = (height || parseInt(container.style('height')) || 400)
                              - margin.top - margin.bottom;
 
-      chart.update = function() { chart(selection); };
+      chart.update = function() { container.transition().call(chart); };
       chart.container = this;
 
       //set state.disabled
@@ -170,7 +170,7 @@ nv.models.pieChart = function() {
         state.disabled = data[0].map(function(d) { return !!d.disabled });
         dispatch.stateChange(state);
 
-        selection.transition().call(chart)
+        chart.update();
       });
 
       pie.dispatch.on('elementMouseout.tooltip', function(e) {
@@ -188,7 +188,7 @@ nv.models.pieChart = function() {
           state.disabled = e.disabled;
         }
 
-        selection.call(chart);
+        chart.update();
       });
 
       //============================================================
diff --git a/src/models/scatterChart.js b/src/models/scatterChart.js
index b41e5c2..3d7fe39 100644
--- a/src/models/scatterChart.js
+++ b/src/models/scatterChart.js
@@ -104,7 +104,7 @@ nv.models.scatterChart = function() {
           availableHeight = (height || parseInt(container.style('height')) || 400)
                              - margin.top - margin.bottom;
 
-      chart.update = function() { chart(selection) };
+      chart.update = function() { container.transition().call(chart); };
       chart.container = this;
 
       //set state.disabled
@@ -365,7 +365,7 @@ nv.models.scatterChart = function() {
           pauseFisheye = false;
         }
 
-        chart(selection);
+        chart.update();
       });
 
       legend.dispatch.on('legendClick', function(d,i, that) {
@@ -382,7 +382,7 @@ nv.models.scatterChart = function() {
         state.disabled = data.map(function(d) { return !!d.disabled });
         dispatch.stateChange(state);
 
-        chart(selection);
+        chart.update();
       });
 
       /*
diff --git a/src/models/scatterPlusLineChart.js b/src/models/scatterPlusLineChart.js
index 93a7911..7a0bf42 100644
--- a/src/models/scatterPlusLineChart.js
+++ b/src/models/scatterPlusLineChart.js
@@ -103,7 +103,7 @@ nv.models.scatterPlusLineChart = function() {
           availableHeight = (height || parseInt(container.style('height')) || 400)
                              - margin.top - margin.bottom;
 
-      chart.update = function() { chart(selection) };
+      chart.update = function() { container.transition().call(chart); };
       chart.container = this;
 
       //set state.disabled
@@ -379,7 +379,7 @@ nv.models.scatterPlusLineChart = function() {
           pauseFisheye = false;
         }
 
-        chart(selection);
+        chart.update();
       });
 
       legend.dispatch.on('legendClick', function(d,i, that) {
@@ -396,7 +396,7 @@ nv.models.scatterPlusLineChart = function() {
         state.disabled = data.map(function(d) { return !!d.disabled });
         dispatch.stateChange(state);
 
-        chart(selection);
+        chart.update();
       });
 
       /*
@@ -436,7 +436,7 @@ nv.models.scatterPlusLineChart = function() {
           state.disabled = e.disabled;
         }
 
-        selection.call(chart);
+        chart.update();
       });
 
       //============================================================
diff --git a/src/models/stackedAreaChart.js b/src/models/stackedAreaChart.js
index 91cfff7..a01dee8 100644
--- a/src/models/stackedAreaChart.js
+++ b/src/models/stackedAreaChart.js
@@ -77,7 +77,7 @@ nv.models.stackedAreaChart = function() {
           availableHeight = (height || parseInt(container.style('height')) || 400)
                              - margin.top - margin.bottom;
 
-      chart.update = function() { chart(selection) };
+      chart.update = function() { container.transition().call(chart); };
       chart.container = this;
 
       //set state.disabled
@@ -267,7 +267,7 @@ nv.models.stackedAreaChart = function() {
         dispatch.stateChange(state);
 
         //selection.transition().call(chart);
-        chart(selection);
+        chart.update();
       });
 
       legend.dispatch.on('legendClick', function(d,i) {
@@ -284,7 +284,7 @@ nv.models.stackedAreaChart = function() {
         dispatch.stateChange(state);
 
         //selection.transition().call(chart);
-        chart(selection);
+        chart.update();
       });
 
       controls.dispatch.on('legendClick', function(d,i) {
@@ -312,7 +312,7 @@ nv.models.stackedAreaChart = function() {
         dispatch.stateChange(state);
 
         //selection.transition().call(chart);
-        chart(selection);
+        chart.update();
       });
 
       dispatch.on('tooltipShow', function(e) {
@@ -334,7 +334,7 @@ nv.models.stackedAreaChart = function() {
           stacked.style(e.style);
         }
 
-        selection.call(chart);
+        chart.update();
       });
 
     });
diff --git a/src/nv.d3.css b/src/nv.d3.css
index 163b9a8..02347d0 100644
--- a/src/nv.d3.css
+++ b/src/nv.d3.css
@@ -180,7 +180,8 @@ svg .title {
   shape-rendering: crispEdges;
 }
 
-.nvd3 .nv-axis line.zero {
+.nvd3 .nv-axis .zero line,
+/*this selector may not be necessary*/ .nvd3 .nv-axis line.zero {
   stroke-opacity: .75;
 }