Readme and comments updated