Update Readme and comments