Small fixes, update README and CHANGELOG.