Include time on graphs, fix formatting