Update README.md and some comments