Changes to timestamp and labels for graphs, and other tweaks