diff --git a/index.html b/index.html
index c7dbd85..51218ea 100644
--- a/index.html
+++ b/index.html
@@ -42,18 +42,17 @@
     <section id="abstract" class="informative">
       <p>
         This specification defines an API allowing <a data-cite=
-        "appmanifest">web applications</a> to set an application-wide badge,
+        "appmanifest#installable-web-applications">web applications</a> to set an application-wide badge,
         shown in an operating-system-specific place associated with the
         application (such as the shelf or home screen), for the purpose of
         notifying the user when the state of the application has changed (e.g.,
         when new messages have arrived), without showing a more heavyweight
-        <a data-cite="NOTIFICATIONS">notification</a>.
+        <a data-cite="notifications#concept-notification">notification</a>.
       </p>
     </section>
     <section id="sotd">
       <p>
-        This specification is currently a work in progress. Implementors should
-        not expose the API surface to the open web.
+        This is an early draft of the Badging API spec.
       </p>
     </section>
     <section class="informative">
@@ -93,7 +92,7 @@ <h2>
       </h2>
       <p>
         There is a single global badge associated with each <a data-cite=
-        "appmanifest">web application</a>. At any time, the application's badge
+        "appmanifest#installable-web-applications">web application</a>. At any time, the application's badge
         is set to one of the following values:
       </p>
       <ul>
@@ -121,12 +120,10 @@ <h2>
         Badge display
       </h2>
       <p>
-        When the application is <a data-cite=
-        "appmanifest#dfn-installing">installed</a> and the application's flag
-        is <a>set</a>, the user agent SHOULD display the application's badge
-        alongside the symbolic representation of the application in the user's
-        operating system (for example, as a small overlay on top of the
-        application's icon).
+        When the application's flag is <a>set</a>, the user agent SHOULD display
+        the application's badge alongside the symbolic representation of the
+        application in the user's operating system (for example, as a small
+        overlay on top of the application's icon).
       </p>
       <p>
         The special value <b>flag</b> indicates that the badge is set, but
@@ -153,7 +150,7 @@ <h2>
         <code>Badge</code> interface
       </h2>
       <pre class="idl">
-        [Exposed=(Window, Worker)]
+        [Exposed=(Window)]
         interface Badge {
           static void set(optional [EnforceRange] unsigned long long contents);
           static void clear();
@@ -163,13 +160,6 @@ <h2>
         The <dfn>Badge</dfn> interface provides methods for setting and
         clearing the application badge indicator.
       </p>
-      <div class="issue">
-        This section is not clear about which web application is associated
-        with a particular context. In particular, when called from a
-        <a data-cite="service-workers-1">service worker</a> whose scope is
-        outside of the <a data-cite="appmanifest">app manifest</a> scope, the
-        web application may be ambiguous.
-      </div>
       <section>
         <h3>
           <dfn>set()</dfn> method
@@ -213,7 +203,7 @@ <h2>
       <p>
         <code><dfn data-cite=
         "!ECMASCRIPT#sec-native-error-types-used-in-this-standard-typeerror">TypeError</dfn></code>
-        is defined by [[!ECMASCRIPT]].
+        is defined by [[ECMASCRIPT]].
       </p>
     </section>
   </body>