Update README and little fixes