Readme and minor fixes