diff --git a/README.md b/README.md
index 9a3e9fa..9223076 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,4 @@ The Gamepad specification defines a low-level interface that represents gamepad
 This repository is for editing drafts and discussion of the [Gamepad](https://w3c.github.io/gamepad/) specification
 (and [extensions](https://w3c.github.io/gamepad/extensions.html) to it).
 
-See [FeatureRequests.md](FeatureRequests.md) for feature requests beyond the first version of this spec. 
-
 This specification is part of the [Web Apps WG](https://github.com/w3c/webappswg).
diff --git a/index.html b/index.html
index 8ca6304..433782b 100644
--- a/index.html
+++ b/index.html
@@ -510,8 +510,13 @@ <h3>
           <li>Let |navigator:Navigator| be |gamepad|'s [=relevant global
           object=]'s {{Navigator}} object.
           </li>
+          <li>Let |document:Document?| be |gamepad|'s [=relevant global
+          object=]'s [=associated `Document`=]; otherwise `null`.
+          </li>
           <li>If |navigator|.{{Navigator/[[hasGamepadGesture]]}} is `false` and
-          |gamepad| [=contains a gamepad user gesture=]:
+          |document| is a [=Document/fully active descendant of a top-level
+          traversable with user attention=] and |gamepad| [=contains a gamepad
+          user gesture=]:
             <ol>
               <li>Set |navigator|.{{Navigator/[[hasGamepadGesture]]}} to
               `true`.
@@ -527,10 +532,6 @@ <h3>
                       <li>Set |connectedGamepad|.{{Gamepad/[[timestamp]]}} to
                       |now|.
                       </li>
-                      <li>Let |document:Document?| be |gamepad|'s [=relevant
-                      global object=]'s [=associated `Document`=]; otherwise
-                      `null`.
-                      </li>
                       <li>If |document| is not `null` and is [=Document/fully
                       active=], then [=queue a task=] on the [=gamepad task
                       source=] to [=fire an event=] named {{gamepadconnected}}
@@ -1681,8 +1682,8 @@ <h3>
           The {{Navigator/getGamepads()}} method steps are:
         </p>
         <ol>
-          <li>Let |doc| be the [=current global object=]'s [=associated
-          `Document`=].
+          <li>Let |doc:Document?| be the [=current global object=]'s
+          [=associated `Document`=].
           </li>
           <li>If |doc| is `null` or |doc| is not [=Document/fully active=],
           then return an empty [=list=].
@@ -1697,6 +1698,8 @@ <h3>
           <li>Let |now:DOMHighResTimeStamp| be the [=current high resolution
           time=].
           </li>
+          <li>Let |gamepads:sequence&lt;Gamepad?&gt;| be an empty [=list=].
+          </li>
           <li>[=list/For each=] |gamepad:Gamepad| of
           [=this=].{{Navigator/[[gamepads]]}}:
             <ol>
@@ -1709,6 +1712,8 @@ <h3>
                   </li>
                 </ol>
               </li>
+              <li>[=list/Append=] |gamepad| to |gamepads|.
+              </li>
             </ol>
           </li>
           <li>Return |gamepads|.