squashed some d3plus bugs