Minor changes, time to timestamp