Tidy up dates and fix issue with blank line on task list