fixed some whitespace issues and comments for timestamps