Update README.md and fix some comments