rebase: updates based on PR comments