Fixed corner case of first update, and fixed dynamic x-axis labels