diff --git a/index.bs b/index.bs
index 1a076e07e3..eff8e4ee4e 100644
--- a/index.bs
+++ b/index.bs
@@ -539,7 +539,7 @@ and an [=environment settings object=] |settings|, run the following steps:
1. Let |currentTime| be the current time.
1. Assert: |params|["{{AttributionSourceParams/attributionDestination}}"] and
|params|["{{AttributionSourceParams/attributionSourceEventId}}"] [=map/exist=].
-1. If |settings|'s [=environment settings object/responsible document=] is
+1. If |settings|'s [=relevant global object=]'s [=associated Document=] is
not [=allowed to use=] the [=attribution-reporting=] [=policy-controlled feature=], return null.
1. Let |attributionDestination| be the result of running
[=parse an attribution destination=] with |params|["{{AttributionSourceParams/attributionDestination}}"].
@@ -699,7 +699,7 @@ Given a [=request=] |request|:
return allowed.
1. Let |environment| be |request|'s [=request/window=].
1. If |environment| is not an [=environment settings object=], return allowed.
-1. If |environment|'s [=environment settings object/responsible document=] is not [=allowed to use=] the [=attribution-reporting=] [=policy-controlled feature=],
+1. If |environment|'s [=relevant global object=]'s [=associated Document=] is not [=allowed to use=] the [=attribution-reporting=] [=policy-controlled feature=],
return allowed.
1. If |environment|'s [=environment settings object/origin=] is not a [=potentially trustworthy origin=], return allowed.
1. If |environment|'s [=environment/top-level origin=] is an [=opaque origin=], return allowed.
@@ -890,12 +890,12 @@ To queue a report for delivery given an [=attribution report=] |repor
1. If |report|'s [=attribution report/delivered=] value is true, return.
1. Set |report|'s [=attribution report/delivered=] value to true.
1. If |report|'s [=attribution report/report time=] is less than the current time, add an [=implementation-defined=] random amount to report time.
-
- Note: On startup, it is possible the user agent will need to send many reports whose report times passed while the browser was
+
+ Note: On startup, it is possible the user agent will need to send many reports whose report times passed while the browser was
closed. Adding random delay prevents temporal joining of reports from different [=attribution source/source origin=]s.
1. Wait until |report|'s [=attribution report/report time=] is the current time.
1. Optionally, wait a further [=implementation-defined=] length of time.
-
+
Note: This is intended to allow user agents to optimize device resource usage.
1. Run [=attempt to deliver a report=] with |report|.
@@ -986,7 +986,7 @@ To attempt to deliver a report given an [=attribution report=] |repor
:: "`no-store`"
1. [=Queue a task=] to [=fetch=] |request| with [=fetch/processResponse=] being these steps:
1. [=Queue a task=] to remove |report| from the [=attribution report cache=].
-
+
Issue(220): This fetch should use a network partition key for an opaque origin.
A user agent MAY retry this algorithm in the event that there was an error.