update changelog
integrate review comments