Rework some wording
Add timestamp