Updated README.md and some minor fixes