updates based on PR comments