Add timestamp, some cosmetic fixes.