Update README.md and comments