Readme and comments improved