Changelog update
PR comments corrections