Update README and tweak comments