Update README and small improvements