add timestamps to the graph, some cleanups