Updated README and comments