Updated readme and minor fixes