Update some comments and Readme