Fix graph re-render issues & decimals/negatives