Update README and some tiny adjustments