Always timestamps (not timetags) and small style fixes