Update CHANGELOG.md and fixes basede on PR comments.