Tidy up the readme a bit and fix the todo reminders