update comments to reflect new self-request handling