Cleanup.
Added saving of the true timestamps.