shape support, d3 clean up and highlighting