Update README and fix comments