Cleanup and README.md changes.