Remove some comments, fix a bug, and update the Readme