Updated readme and comments