Fixed better tooltips and better axis labels