several CR fixes and updates are implemented