Update README and add some trivial changes in the code.