Tidy up, update readme.