Readme.md and minor fixes