Lotsa fixes for time-series chart