A bit more work on time stamps

A bit more work on time stamps. Loads more places to be done, but I thought I'd do these, for now.