Update to README for changes, and minor cleanup