Added labels, tooltips from mbostock Uber example.  Cleaned up.