updates from PR review