Tidy up comments, update README