Updated Readme and comments