address comments on PR