address new PR comments