improvement in values display on graph + bug fix 1432