More cleanup + Bugfix: added back timestamp line in plot 2.