Update to README and small tidy up