diff --git a/index.html b/index.html
index c6e0503..2e7226f 100644
--- a/index.html
+++ b/index.html
@@ -5,12 +5,15 @@
         Iteration
 
         
-            Properties of the Iterator Constructor
+            Iterator Objects
 
             
-                Iterator.range ( _start_, _end_, _optionOrStep_ )
+                Properties of the Iterator Constructor
+
                 
-                    1. If _start_ is a Number, return ? CreateNumericRangeIterator(_s">
+                    Iterator.range ( _start_, _end_, _optionOrStep_ )
+                    
+                        1.">
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.0.1/styles/base16/solarized-light.min.css"><link rel="stylesheet" href="./spec.css">
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/styles/github.min.css">
 <script src="./spec.js"></script>
@@ -1621,7 +1624,7 @@
 });
 
 let sdoMap = JSON.parse(`{}`);
-let biblio = JSON.parse(`{"refsByClause":{"sec-iterator.range":["_ref_0","_ref_1"],"sec-numeric-range-iterator-object":["_ref_2"],"sec-create-numeric-range-iterator":["_ref_3"],"sec-%numericrangeiteratorprototype%-object":["_ref_4"]},"entries":[{"type":"clause","id":"sec-iterator.range","title":"Iterator.range ( start, end, optionOrStep )","titleHTML":"Iterator.range ( <var>start</var>, <var>end</var>, <var>optionOrStep</var> )","number":"27.1.2.1"},{"type":"clause","id":"sec-properties-of-the-iterator-constructor","titleHTML":"Properties of the Iterator Constructor","number":"27.1.2"},{"type":"term","term":"NumericRangeIterator","refId":"sec-numeric-range-iterator-object"},{"type":"op","aoid":"CreateNumericRangeIterator","refId":"sec-create-numeric-range-iterator"},{"type":"clause","id":"sec-create-numeric-range-iterator","title":"CreateNumericRangeIterator ( start, end, optionOrStep, type )","titleHTML":"CreateNumericRangeIterator ( <var>start</var>, <var>end</var>, <var>optionOrStep</var>, <var>type</var> )","number":"27.1.3.1","referencingIds":["_ref_0","_ref_1","_ref_2"]},{"type":"term","term":"%NumericRangeIteratorPrototype%","refId":"sec-%numericrangeiteratorprototype%-object"},{"type":"clause","id":"sec-properties-of-the-numericrangeiterator-prototype-object-next","titleHTML":"%NumericRangeIterator%.next ( )","number":"27.1.3.2.1"},{"type":"clause","id":"sec-properties-of-the-numericrangeiterator-prototype-object-@@tostringtag","titleHTML":"%NumericRangeIteratorPrototype%.[@@toStringTag]","number":"27.1.3.2.2"},{"type":"clause","id":"sec-%numericrangeiteratorprototype%-object","titleHTML":"The %NumericRangeIteratorPrototype% Object","number":"27.1.3.2","referencingIds":["_ref_3"]},{"type":"clause","id":"sec-numeric-range-iterator-object","title":"The NumericRangeIterator Object","titleHTML":"The <dfn tabindex=\\"-1\\">NumericRangeIterator</dfn> Object","number":"27.1.3","referencingIds":["_ref_4"]},{"type":"clause","id":"sec-iteration","titleHTML":"Iteration","number":"27.1"},{"type":"clause","id":"sec-control-abstraction-objects","titleHTML":"Control Abstraction Objects","number":"27"}]}`);
+let biblio = JSON.parse(`{"refsByClause":{"sec-iterator.range":["_ref_0","_ref_1"],"sec-numeric-range-iterator-object":["_ref_2"],"sec-create-numeric-range-iterator":["_ref_3"],"sec-%numericrangeiteratorprototype%-object":["_ref_4"]},"entries":[{"type":"clause","id":"sec-iterator.range","title":"Iterator.range ( start, end, optionOrStep )","titleHTML":"Iterator.range ( <var>start</var>, <var>end</var>, <var>optionOrStep</var> )","number":"27.1.3.2.2"},{"type":"clause","id":"sec-properties-of-the-iterator-constructor","titleHTML":"Properties of the Iterator Constructor","number":"27.1.3.2"},{"type":"clause","id":"sec-iterator-objects","titleHTML":"Iterator Objects","number":"27.1.3"},{"type":"term","term":"NumericRangeIterator","refId":"sec-numeric-range-iterator-object"},{"type":"op","aoid":"CreateNumericRangeIterator","refId":"sec-create-numeric-range-iterator"},{"type":"clause","id":"sec-create-numeric-range-iterator","title":"CreateNumericRangeIterator ( start, end, optionOrStep, type )","titleHTML":"CreateNumericRangeIterator ( <var>start</var>, <var>end</var>, <var>optionOrStep</var>, <var>type</var> )","number":"27.1.4.1","referencingIds":["_ref_0","_ref_1","_ref_2"]},{"type":"term","term":"%NumericRangeIteratorPrototype%","refId":"sec-%numericrangeiteratorprototype%-object"},{"type":"clause","id":"sec-properties-of-the-numericrangeiterator-prototype-object-next","titleHTML":"%NumericRangeIterator%.next ( )","number":"27.1.4.2.1"},{"type":"clause","id":"sec-properties-of-the-numericrangeiterator-prototype-object-@@tostringtag","titleHTML":"%NumericRangeIteratorPrototype%.[@@toStringTag]","number":"27.1.4.2.2"},{"type":"clause","id":"sec-%numericrangeiteratorprototype%-object","titleHTML":"The %NumericRangeIteratorPrototype% Object","number":"27.1.4.2","referencingIds":["_ref_3"]},{"type":"clause","id":"sec-numeric-range-iterator-object","title":"The NumericRangeIterator Object","titleHTML":"The <dfn tabindex=\\"-1\\">NumericRangeIterator</dfn> Object","number":"27.1.4","referencingIds":["_ref_4"]},{"type":"clause","id":"sec-iteration","titleHTML":"Iteration","number":"27.1"},{"type":"clause","id":"sec-control-abstraction-objects","titleHTML":"Control Abstraction Objects","number":"27"}]}`);
 ;let usesMultipage = false</script><style>/* IBM Plex fonts (Latin subset) have been downloaded from Google Fonts and modified to add support back in for the `zero` substitution (slashed zeroes) */
 
 /* https://fonts.googleapis.com/css2?family=IBM%20Plex%20Serif:ital,wght@0,400;0,700;1,400;1,700&display=swap */
@@ -3298,7 +3301,7 @@
 </ul></div><div id="menu-toggle"><svg xmlns="http://www.w3.org/2000/svg" style="width:100%; height:100%; stroke:currentColor" viewBox="0 0 120 120" width="54" height="54">
       <title>Menu</title>
       <path stroke-width="10" stroke-linecap="round" d="M30,60 h60  M30,30 m0,5 h60  M30,90 m0,-5 h60"></path>
-    </svg></div><div id="menu-spacer" class="menu-spacer"></div><div id="menu"><div id="menu-search"><input type="text" id="menu-search-box" placeholder="Search..."><div id="menu-search-results" class="inactive"></div></div><div id="menu-pins"><div class="menu-pane-header">Pins<button class="unpin-all">clear</button></div><ul id="menu-pins-list"></ul></div><div class="menu-pane-header">Table of Contents</div><div id="menu-toc"><ol class="toc"><li><span class="item-toggle">+</span><a href="#sec-control-abstraction-objects" title="Control Abstraction Objects"><span class="secnum">27</span> Control Abstraction Objects</a><ol class="toc"><li><span class="item-toggle">+</span><a href="#sec-iteration" title="Iteration"><span class="secnum">27.1</span> Iteration</a><ol class="toc"><li><span class="item-toggle">+</span><a href="#sec-properties-of-the-iterator-constructor" title="Properties of the Iterator Constructor"><span class="secnum">27.1.2</span> Properties of the Iterator Constructor</a><ol class="toc"><li><span class="item-toggle-none"></span><a href="#sec-iterator.range" title="Iterator.range ( start, end, optionOrStep )"><span class="secnum">27.1.2.1</span> Iterator.range ( <var>start</var>, <var>end</var>, <var>optionOrStep</var> )</a></li></ol></li><li><span class="item-toggle">+</span><a href="#sec-numeric-range-iterator-object" title="The NumericRangeIterator Object"><span class="secnum">27.1.3</span> The <dfn tabindex="-1">NumericRangeIterator</dfn> Object</a><ol class="toc"><li><span class="item-toggle-none"></span><a href="#sec-create-numeric-range-iterator" title="CreateNumericRangeIterator ( start, end, optionOrStep, type )"><span class="secnum">27.1.3.1</span> CreateNumericRangeIterator ( <var>start</var>, <var>end</var>, <var>optionOrStep</var>, <var>type</var> )</a></li><li><span class="item-toggle">+</span><a href="#sec-%numericrangeiteratorprototype%-object" title="The %NumericRangeIteratorPrototype% Object"><span class="secnum">27.1.3.2</span> The %NumericRangeIteratorPrototype% Object</a><ol class="toc"><li><span class="item-toggle-none"></span><a href="#sec-properties-of-the-numericrangeiterator-prototype-object-next" title="%NumericRangeIterator%.next ( )"><span class="secnum">27.1.3.2.1</span> %NumericRangeIterator%.next ( )</a></li><li><span class="item-toggle-none"></span><a href="#sec-properties-of-the-numericrangeiterator-prototype-object-@@tostringtag" title="%NumericRangeIteratorPrototype%.[@@toStringTag]"><span class="secnum">27.1.3.2.2</span> %NumericRangeIteratorPrototype%.[@@toStringTag]</a></li></ol></li></ol></li></ol></li></ol></li></ol></div></div><div id="spec-container"><h1 class="version">Stage 1 Draft / January 27, 2025</h1><h1 class="title">Range proposal</h1>
+    </svg></div><div id="menu-spacer" class="menu-spacer"></div><div id="menu"><div id="menu-search"><input type="text" id="menu-search-box" placeholder="Search..."><div id="menu-search-results" class="inactive"></div></div><div id="menu-pins"><div class="menu-pane-header">Pins<button class="unpin-all">clear</button></div><ul id="menu-pins-list"></ul></div><div class="menu-pane-header">Table of Contents</div><div id="menu-toc"><ol class="toc"><li><span class="item-toggle">+</span><a href="#sec-control-abstraction-objects" title="Control Abstraction Objects"><span class="secnum">27</span> Control Abstraction Objects</a><ol class="toc"><li><span class="item-toggle">+</span><a href="#sec-iteration" title="Iteration"><span class="secnum">27.1</span> Iteration</a><ol class="toc"><li><span class="item-toggle">+</span><a href="#sec-iterator-objects" title="Iterator Objects"><span class="secnum">27.1.3</span> Iterator Objects</a><ol class="toc"><li><span class="item-toggle">+</span><a href="#sec-properties-of-the-iterator-constructor" title="Properties of the Iterator Constructor"><span class="secnum">27.1.3.2</span> Properties of the Iterator Constructor</a><ol class="toc"><li><span class="item-toggle-none"></span><a href="#sec-iterator.range" title="Iterator.range ( start, end, optionOrStep )"><span class="secnum">27.1.3.2.2</span> Iterator.range ( <var>start</var>, <var>end</var>, <var>optionOrStep</var> )</a></li></ol></li></ol></li><li><span class="item-toggle">+</span><a href="#sec-numeric-range-iterator-object" title="The NumericRangeIterator Object"><span class="secnum">27.1.4</span> The <dfn tabindex="-1">NumericRangeIterator</dfn> Object</a><ol class="toc"><li><span class="item-toggle-none"></span><a href="#sec-create-numeric-range-iterator" title="CreateNumericRangeIterator ( start, end, optionOrStep, type )"><span class="secnum">27.1.4.1</span> CreateNumericRangeIterator ( <var>start</var>, <var>end</var>, <var>optionOrStep</var>, <var>type</var> )</a></li><li><span class="item-toggle">+</span><a href="#sec-%numericrangeiteratorprototype%-object" title="The %NumericRangeIteratorPrototype% Object"><span class="secnum">27.1.4.2</span> The %NumericRangeIteratorPrototype% Object</a><ol class="toc"><li><span class="item-toggle-none"></span><a href="#sec-properties-of-the-numericrangeiterator-prototype-object-next" title="%NumericRangeIterator%.next ( )"><span class="secnum">27.1.4.2.1</span> %NumericRangeIterator%.next ( )</a></li><li><span class="item-toggle-none"></span><a href="#sec-properties-of-the-numericrangeiterator-prototype-object-@@tostringtag" title="%NumericRangeIteratorPrototype%.[@@toStringTag]"><span class="secnum">27.1.4.2.2</span> %NumericRangeIteratorPrototype%.[@@toStringTag]</a></li></ol></li></ol></li></ol></li></ol></li></ol></div></div><div id="spec-container"><h1 class="version">Stage 1 Draft / January 27, 2025</h1><h1 class="title">Range proposal</h1>
 
 <emu-clause id="sec-control-abstraction-objects" number="27">
     <h1><span class="secnum">27</span> Control Abstraction Objects</h1>
@@ -3306,28 +3309,33 @@ <h1><span class="secnum">27</span> Control Abstraction Objects</h1>
     <emu-clause id="sec-iteration" number="1">
         <h1><span class="secnum">27.1</span> Iteration</h1>
 
-        <emu-clause id="sec-properties-of-the-iterator-constructor" number="2">
-            <h1><span class="secnum">27.1.2</span> Properties of the Iterator Constructor</h1>
+        <emu-clause id="sec-iterator-objects" number="3">
+            <h1><span class="secnum">27.1.3</span> Iterator Objects</h1>
+
+            <emu-clause id="sec-properties-of-the-iterator-constructor" number="2">
+                <h1><span class="secnum">27.1.3.2</span> Properties of the Iterator Constructor</h1>
 
-            <emu-clause id="sec-iterator.range">
-                <h1><span class="secnum">27.1.2.1</span> Iterator.range ( <var>start</var>, <var>end</var>, <var>optionOrStep</var> )</h1>
-                <emu-alg><ol><li>If <var>start</var> <emu-xref href="#sec-ecmascript-language-types-number-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-number-type">is a Number</a></emu-xref>, return ?&nbsp;<emu-xref aoid="CreateNumericRangeIterator" id="_ref_0"><a href="#sec-create-numeric-range-iterator">CreateNumericRangeIterator</a></emu-xref>(<var>start</var>, <var>end</var>, <var>optionOrStep</var>, <emu-const>number-range</emu-const>).</li><li>If <var>start</var> <emu-xref href="#sec-ecmascript-language-types-bigint-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-bigint-type">is a BigInt</a></emu-xref>, return ?&nbsp;<emu-xref aoid="CreateNumericRangeIterator" id="_ref_1"><a href="#sec-create-numeric-range-iterator">CreateNumericRangeIterator</a></emu-xref>(<var>start</var>, <var>end</var>, <var>optionOrStep</var>, <emu-const>bigint-range</emu-const>).</li><li>Throw a <emu-val>TypeError</emu-val> exception.</li></ol></emu-alg>
+                <emu-clause id="sec-iterator.range" number="2">
+                    <h1><span class="secnum">27.1.3.2.2</span> Iterator.range ( <var>start</var>, <var>end</var>, <var>optionOrStep</var> )</h1>
+                    <emu-alg><ol><li>If <var>start</var> <emu-xref href="#sec-ecmascript-language-types-number-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-number-type">is a Number</a></emu-xref>, return ?&nbsp;<emu-xref aoid="CreateNumericRangeIterator" id="_ref_0"><a href="#sec-create-numeric-range-iterator">CreateNumericRangeIterator</a></emu-xref>(<var>start</var>, <var>end</var>, <var>optionOrStep</var>, <emu-const>number-range</emu-const>).</li><li>If <var>start</var> <emu-xref href="#sec-ecmascript-language-types-bigint-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-bigint-type">is a BigInt</a></emu-xref>, return ?&nbsp;<emu-xref aoid="CreateNumericRangeIterator" id="_ref_1"><a href="#sec-create-numeric-range-iterator">CreateNumericRangeIterator</a></emu-xref>(<var>start</var>, <var>end</var>, <var>optionOrStep</var>, <emu-const>bigint-range</emu-const>).</li><li>Throw a <emu-val>TypeError</emu-val> exception.</li></ol></emu-alg>
+                </emu-clause>
             </emu-clause>
         </emu-clause>
 
         <emu-clause id="sec-numeric-range-iterator-object">
-            <h1><span class="secnum">27.1.3</span> The <dfn tabindex="-1">NumericRangeIterator</dfn> Object</h1>
+            <h1><span class="secnum">27.1.4</span> The <dfn tabindex="-1">NumericRangeIterator</dfn> Object</h1>
             <p>A NumericRangeIterator object is an <emu-xref href="#sec-iterator-interface"><a href="https://tc39.es/ecma262/#sec-iterator-interface">iterator</a></emu-xref> that yields numbers. There is not a named <emu-xref href="#constructor"><a href="https://tc39.es/ecma262/#constructor">constructor</a></emu-xref> for NumericRangeIterator objects. Instead, NumericRangeIterator objects are created by the <emu-xref aoid="CreateNumericRangeIterator" id="_ref_2"><a href="#sec-create-numeric-range-iterator">CreateNumericRangeIterator</a></emu-xref> abstract operation as needed.</p>
 
             <emu-clause id="sec-create-numeric-range-iterator" type="abstract operation" aoid="CreateNumericRangeIterator">
-                <h1><span class="secnum">27.1.3.1</span> CreateNumericRangeIterator ( <var>start</var>, <var>end</var>, <var>optionOrStep</var>, <var>type</var> )</h1>
+                <h1><span class="secnum">27.1.4.1</span> CreateNumericRangeIterator ( <var>start</var>, <var>end</var>, <var>optionOrStep</var>, <var>type</var> )</h1>
                 <p>The abstract operation CreateNumericRangeIterator takes arguments <var>start</var> (a Number or a BigInt), <var>end</var> (an <emu-xref href="#sec-ecmascript-language-types"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types">ECMAScript language value</a></emu-xref>), <var>optionOrStep</var> (an <emu-xref href="#sec-ecmascript-language-types"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types">ECMAScript language value</a></emu-xref>), and <var>type</var> (<emu-const>number-range</emu-const> or <emu-const>bigint-range</emu-const>) and returns either a <emu-xref href="#sec-completion-record-specification-type"><a href="https://tc39.es/ecma262/#sec-completion-record-specification-type">normal completion containing</a></emu-xref> an <emu-xref href="#sec-ecmascript-language-types"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types">ECMAScript language value</a></emu-xref> or a <emu-xref href="#sec-completion-record-specification-type"><a href="https://tc39.es/ecma262/#sec-completion-record-specification-type">throw completion</a></emu-xref>. It performs the following steps when called:</p>
-                <emu-alg><ol><li>If <var>start</var> is <emu-val>NaN</emu-val>, throw a <emu-val>RangeError</emu-val> exception.</li><li>If <var>end</var> is <emu-val>NaN</emu-val>, throw a <emu-val>RangeError</emu-val> exception.</li><li>If <var>type</var> is <emu-const>number-range</emu-const>, then<ol><li><emu-xref href="#assert"><a href="https://tc39.es/ecma262/#assert">Assert</a></emu-xref>: <var>start</var> <emu-xref href="#sec-ecmascript-language-types-number-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-number-type">is a Number</a></emu-xref>.</li><li>If <var>end</var> <emu-xref href="#sec-ecmascript-language-types-number-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-number-type">is not a Number</a></emu-xref>, throw a <emu-val>TypeError</emu-val> exception.</li><li>Let <var>zero</var> be <emu-val>0</emu-val><sub>ℤ</sub>.</li><li>Let <var>one</var> be <emu-val>1</emu-val><sub>ℤ</sub>.</li></ol></li><li>Else,<ol><li><emu-xref href="#assert"><a href="https://tc39.es/ecma262/#assert">Assert</a></emu-xref>: <var>start</var> <emu-xref href="#sec-ecmascript-language-types-bigint-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-bigint-type">is a BigInt</a></emu-xref>.
-                        <emu-note type="editor"><span class="note">Editor's Note</span><div class="note-contents">Allowing all kinds of number (bigint, decimals, ...) to range from a <emu-xref href="#finite"><a href="https://tc39.es/ecma262/#finite">finite</a></emu-xref> number to infinity.</div></emu-note></li><li>If <var>end</var> is not <emu-val>+∞</emu-val><sub>𝔽</sub> or <emu-val>-∞</emu-val><sub>𝔽</sub> and <var>end</var> <emu-xref href="#sec-ecmascript-language-types-bigint-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-bigint-type">is not a BigInt</a></emu-xref>, throw a <emu-val>TypeError</emu-val> exception.</li><li>Let <var>zero</var> be <emu-val>0</emu-val><sub>ℤ</sub>.</li><li>Let <var>one</var> be <emu-val>1</emu-val><sub>ℤ</sub>.</li></ol></li><li>If <var>start</var> is <emu-val>+∞</emu-val><sub>𝔽</sub> or <emu-val>-∞</emu-val><sub>𝔽</sub>, throw a <emu-val>RangeError</emu-val> exception.</li><li>Let <var>inclusiveEnd</var> be <emu-val>false</emu-val>.</li><li>If <var>optionOrStep</var> is <emu-val>undefined</emu-val> or <emu-val>null</emu-val>, then<ol><li>Let <var>step</var> be <emu-val>undefined</emu-val>.</li></ol></li><li>Else if <var>optionOrStep</var> <emu-xref href="#sec-object-type"><a href="https://tc39.es/ecma262/#sec-object-type">is an Object</a></emu-xref>, then<ol><li>Let <var>step</var> be ?&nbsp;<emu-xref aoid="Get"><a href="https://tc39.es/ecma262/#sec-get-o-p">Get</a></emu-xref>(<var>optionOrStep</var>, <emu-val>"step"</emu-val>).</li><li>Set <var>inclusiveEnd</var> to <emu-xref aoid="ToBoolean"><a href="https://tc39.es/ecma262/#sec-toboolean">ToBoolean</a></emu-xref>(? <emu-xref aoid="Get"><a href="https://tc39.es/ecma262/#sec-get-o-p">Get</a></emu-xref>(<var>optionOrStep</var>, <emu-val>"inclusive"</emu-val>)).</li></ol></li><li>Else if <var>type</var> is <emu-const>number-range</emu-const> and <var>optionOrStep</var> <emu-xref href="#sec-ecmascript-language-types-number-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-number-type">is a Number</a></emu-xref>, then<ol><li>Let <var>step</var> be <var>optionOrStep</var>.</li></ol></li><li>Else if <var>type</var> is <emu-const>bigint-range</emu-const> and <var>optionOrStep</var> <emu-xref href="#sec-ecmascript-language-types-bigint-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-bigint-type">is a BigInt</a></emu-xref>, then<ol><li>Let <var>step</var> be <var>optionOrStep</var>.</li></ol></li><li>Else,<ol><li>Throw a <emu-val>TypeError</emu-val> exception.</li></ol></li><li>If <var>step</var> is <emu-val>undefined</emu-val> or <emu-val>null</emu-val>, then<ol><li>If <var>end</var> &gt; <var>start</var>, let <var>step</var> be <var>one</var>.</li><li>Else let <var>step</var> be -<var>one</var>.</li></ol></li><li>If <var>step</var> is <emu-val>NaN</emu-val>, throw a <emu-val>RangeError</emu-val> exception.</li><li>If <var>type</var> is <emu-const>number-range</emu-const> and <var>step</var> <emu-xref href="#sec-ecmascript-language-types-number-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-number-type">is not a Number</a></emu-xref>, throw a <emu-val>TypeError</emu-val> exception.</li><li>Else if <var>type</var> is <emu-const>bigint-range</emu-const> and <var>step</var> <emu-xref href="#sec-ecmascript-language-types-bigint-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-bigint-type">is not a BigInt</a></emu-xref>, throw a <emu-val>TypeError</emu-val> exception.</li><li>If <var>step</var> is <emu-val>+∞</emu-val><sub>𝔽</sub> or <emu-val>-∞</emu-val><sub>𝔽</sub>, throw a <emu-val>RangeError</emu-val> exception.</li><li>If <var>step</var> is <var>zero</var> and <var>start</var> is not <var>end</var>, throw a <emu-val>RangeError</emu-val> exception.</li><li>Let <var>closure</var> be a new <emu-xref href="#sec-abstract-closure"><a href="https://tc39.es/ecma262/#sec-abstract-closure">Abstract Closure</a></emu-xref> with no parameters that captures <var>start</var>, <var>end</var>, <var>step</var>, <var>inclusiveEnd</var>, <var>zero</var>, <var>one</var> and performs the following steps when called:<ol><li>If <var>end</var> &gt; <var>start</var>, let <var>ifIncrease</var> be <emu-val>true</emu-val>.</li><li>Else let <var>ifIncrease</var> be <emu-val>false</emu-val>.</li><li>If <var>step</var> &gt; <var>zero</var>, let <var>ifStepIncrease</var> be <emu-val>true</emu-val>.</li><li>Else let <var>ifStepIncrease</var> be <emu-val>false</emu-val>.</li><li>If <var>ifIncrease</var> is not <var>ifStepIncrease</var>, return <emu-val>undefined</emu-val>.</li><li>Let <var>hitsEnd</var> be <emu-val>false</emu-val>.</li><li>Let <var>currentCount</var> be <var>zero</var>.</li><li>NOTE: You can debug these steps at https://tc39.es/proposal-Number.range/playground.html .</li><li>Repeat, while <var>hitsEnd</var> is <emu-val>false</emu-val>,<ol><li>Let <var>currentYieldingValue</var> be <var>start</var> + (<var>step</var> * <var>currentCount</var>).</li><li>If <var>currentYieldingValue</var> is <var>end</var>, Set <var>hitsEnd</var> to <emu-val>true</emu-val>.</li><li>Set <var>currentCount</var> to <var>currentCount</var> + <var>one</var>.</li><li>If <var>ifIncrease</var> is <emu-val>true</emu-val>, then<ol><li>If <var>inclusiveEnd</var> is <emu-val>true</emu-val>, then<ol><li>If <var>currentYieldingValue</var> &gt; <var>end</var>, return <emu-val>undefined</emu-val>.</li></ol></li><li>Else,<ol><li>If <var>currentYieldingValue</var> ≥ <var>end</var>, return <emu-val>undefined</emu-val>.</li></ol></li></ol></li><li>Else,<ol><li>If <var>inclusiveEnd</var> is <emu-val>true</emu-val>, then<ol><li>If <var>end</var> &gt; <var>currentYieldingValue</var>, return <emu-val>undefined</emu-val>.</li></ol></li><li>Else,<ol><li>If <var>end</var> ≥ <var>currentYieldingValue</var>, return <emu-val>undefined</emu-val>.</li></ol></li></ol></li><li>Perform ?&nbsp;<emu-xref aoid="Yield"><a href="https://tc39.es/ecma262/#sec-yield">Yield</a></emu-xref>(<var>currentYieldingValue</var>).</li></ol></li><li>Return <emu-val>undefined</emu-val>.</li></ol></li><li>Return <emu-xref aoid="CreateIteratorFromClosure"><a href="https://tc39.es/ecma262/#sec-createiteratorfromclosure">CreateIteratorFromClosure</a></emu-xref>(<var>closure</var>, <emu-val>"%NumericRangeIteratorPrototype%"</emu-val>, <emu-xref href="#sec-%numericrangeiteratorprototype%-object" id="_ref_3"><a href="#sec-%numericrangeiteratorprototype%-object">%NumericRangeIteratorPrototype%</a></emu-xref>).</li></ol></emu-alg>
+                <emu-alg><ol><li>If <var>start</var> is <emu-val>NaN</emu-val>, throw a <emu-val>RangeError</emu-val> exception.</li><li>If <var>end</var> is <emu-val>NaN</emu-val>, throw a <emu-val>RangeError</emu-val> exception.</li><li>If <var>type</var> is <emu-const>number-range</emu-const>, then<ol><li><emu-xref href="#assert"><a href="https://tc39.es/ecma262/#assert">Assert</a></emu-xref>: <var>start</var> <emu-xref href="#sec-ecmascript-language-types-number-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-number-type">is a Number</a></emu-xref>.</li><li>If <var>end</var> <emu-xref href="#sec-ecmascript-language-types-number-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-number-type">is not a Number</a></emu-xref>, throw a <emu-val>TypeError</emu-val> exception.</li><li>Let <var>zero</var> be <emu-val>+0</emu-val><sub>𝔽</sub>.</li><li>Let <var>one</var> be <emu-val>1</emu-val><sub>𝔽</sub>.</li></ol></li><li>Else,<ol><li><emu-xref href="#assert"><a href="https://tc39.es/ecma262/#assert">Assert</a></emu-xref>: <var>start</var> <emu-xref href="#sec-ecmascript-language-types-bigint-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-bigint-type">is a BigInt</a></emu-xref>.
+                        <emu-note type="editor"><span class="note">Editor's Note</span><div class="note-contents">Allowing all kinds of number (bigint, decimals, ...) to range from a <emu-xref href="#finite"><a href="https://tc39.es/ecma262/#finite">finite</a></emu-xref> number to infinity.</div></emu-note></li><li>If <var>end</var> is not <emu-val>+∞</emu-val><sub>𝔽</sub> or <emu-val>-∞</emu-val><sub>𝔽</sub> and <var>end</var> <emu-xref href="#sec-ecmascript-language-types-bigint-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-bigint-type">is not a BigInt</a></emu-xref>, throw a <emu-val>TypeError</emu-val> exception.</li><li>Let <var>zero</var> be <emu-val>0</emu-val><sub>ℤ</sub>.</li><li>Let <var>one</var> be <emu-val>1</emu-val><sub>ℤ</sub>.</li></ol></li><li>If <var>start</var> is <emu-val>+∞</emu-val><sub>𝔽</sub> or <emu-val>-∞</emu-val><sub>𝔽</sub>, throw a <emu-val>RangeError</emu-val> exception.</li><li>Let <var>inclusiveEnd</var> be <emu-val>false</emu-val>.</li><li>If <var>optionOrStep</var> is <emu-val>undefined</emu-val> or <emu-val>null</emu-val>, then<ol><li>Let <var>step</var> be <emu-val>undefined</emu-val>.</li></ol></li><li>Else if <var>optionOrStep</var> <emu-xref href="#sec-object-type"><a href="https://tc39.es/ecma262/#sec-object-type">is an Object</a></emu-xref>, then<ol><li>Let <var>step</var> be ?&nbsp;<emu-xref aoid="Get"><a href="https://tc39.es/ecma262/#sec-get-o-p">Get</a></emu-xref>(<var>optionOrStep</var>, <emu-val>"step"</emu-val>).</li><li>Set <var>inclusiveEnd</var> to <emu-xref aoid="ToBoolean"><a href="https://tc39.es/ecma262/#sec-toboolean">ToBoolean</a></emu-xref>(? <emu-xref aoid="Get"><a href="https://tc39.es/ecma262/#sec-get-o-p">Get</a></emu-xref>(<var>optionOrStep</var>, <emu-val>"inclusive"</emu-val>)).</li></ol></li><li>Else if <var>type</var> is <emu-const>number-range</emu-const> and <var>optionOrStep</var> <emu-xref href="#sec-ecmascript-language-types-number-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-number-type">is a Number</a></emu-xref>, then<ol><li>Let <var>step</var> be <var>optionOrStep</var>.</li></ol></li><li>Else if <var>type</var> is <emu-const>bigint-range</emu-const> and <var>optionOrStep</var> <emu-xref href="#sec-ecmascript-language-types-bigint-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-bigint-type">is a BigInt</a></emu-xref>, then<ol><li>Let <var>step</var> be <var>optionOrStep</var>.</li></ol></li><li>Else,<ol><li>Throw a <emu-val>TypeError</emu-val> exception.</li></ol></li><li>If <var>step</var> is <emu-val>undefined</emu-val> or <emu-val>null</emu-val>, then<ol><li>If <var>end</var> is <emu-val>+∞</emu-val><sub>𝔽</sub>, let <var>step</var> be <var>one</var>.</li><li>Else if <var>end</var> is <emu-val>-∞</emu-val><sub>𝔽</sub>, let <var>step</var> be -<var>one</var>.</li><li><emu-xref href="#assert"><a href="https://tc39.es/ecma262/#assert">Assert</a></emu-xref>: In the next branch, <var>end</var> <emu-xref href="#sec-ecmascript-language-types-bigint-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-bigint-type">is a BigInt</a></emu-xref> and <var>start</var> <emu-xref href="#sec-ecmascript-language-types-bigint-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-bigint-type">is a BigInt</a></emu-xref>, or <var>end</var> <emu-xref href="#sec-ecmascript-language-types-number-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-number-type">is a Number</a></emu-xref> and <var>start</var> <emu-xref href="#sec-ecmascript-language-types-number-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-number-type">is a Number</a></emu-xref>.</li><li>Else if <var>end</var> &gt; <var>start</var>, let <var>step</var> be <var>one</var>.</li><li>Else let <var>step</var> be -<var>one</var>.</li></ol></li><li>If <var>step</var> is <emu-val>NaN</emu-val>, throw a <emu-val>RangeError</emu-val> exception.</li><li>If <var>type</var> is <emu-const>number-range</emu-const> and <var>step</var> <emu-xref href="#sec-ecmascript-language-types-number-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-number-type">is not a Number</a></emu-xref>, throw a <emu-val>TypeError</emu-val> exception.</li><li>Else if <var>type</var> is <emu-const>bigint-range</emu-const> and <var>step</var> <emu-xref href="#sec-ecmascript-language-types-bigint-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-bigint-type">is not a BigInt</a></emu-xref>, throw a <emu-val>TypeError</emu-val> exception.</li><li>If <var>step</var> is <emu-val>+∞</emu-val><sub>𝔽</sub> or <emu-val>-∞</emu-val><sub>𝔽</sub>, throw a <emu-val>RangeError</emu-val> exception.</li><li>If <var>step</var> is <var>zero</var> and <var>start</var> is not <var>end</var>, throw a <emu-val>RangeError</emu-val> exception.</li><li>Let <var>closure</var> be a new <emu-xref href="#sec-abstract-closure"><a href="https://tc39.es/ecma262/#sec-abstract-closure">Abstract Closure</a></emu-xref> with no parameters that captures <var>start</var>, <var>end</var>, <var>step</var>, <var>inclusiveEnd</var>, <var>zero</var>, <var>one</var> and performs the following steps when called:<ol><li>If <var>end</var> is <emu-val>+∞</emu-val><sub>𝔽</sub>, let <var>ifIncrease</var> be <emu-val>true</emu-val>.</li><li>Else if <var>end</var> is <emu-val>-∞</emu-val><sub>𝔽</sub>, let <var>ifIncrease</var> be <emu-val>false</emu-val>.</li><li><emu-xref href="#assert"><a href="https://tc39.es/ecma262/#assert">Assert</a></emu-xref>: In the next branch, <var>end</var> <emu-xref href="#sec-ecmascript-language-types-bigint-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-bigint-type">is a BigInt</a></emu-xref> and <var>start</var> <emu-xref href="#sec-ecmascript-language-types-bigint-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-bigint-type">is a BigInt</a></emu-xref>, or <var>end</var> <emu-xref href="#sec-ecmascript-language-types-number-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-number-type">is a Number</a></emu-xref> and <var>start</var> <emu-xref href="#sec-ecmascript-language-types-number-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-number-type">is a Number</a></emu-xref>.</li><li>Else if <var>end</var> &gt; <var>start</var>, let <var>ifIncrease</var> be <emu-val>true</emu-val>.</li><li>Else let <var>ifIncrease</var> be <emu-val>false</emu-val>.</li><li>If <var>step</var> &gt; <var>zero</var>, let <var>ifStepIncrease</var> be <emu-val>true</emu-val>.</li><li>Else let <var>ifStepIncrease</var> be <emu-val>false</emu-val>.</li><li>If <var>ifIncrease</var> is not <var>ifStepIncrease</var>, return <emu-val>undefined</emu-val>.</li><li>Let <var>hitsEnd</var> be <emu-val>false</emu-val>.</li><li>Let <var>currentCount</var> be <var>zero</var>.</li><li>NOTE: You can debug these steps at https://tc39.es/proposal-Number.range/playground.html .</li><li>Repeat, while <var>hitsEnd</var> is <emu-val>false</emu-val>,<ol><li>Let <var>currentYieldingValue</var> be <var>start</var> + (<var>step</var> * <var>currentCount</var>).</li><li>If <var>currentYieldingValue</var> is <var>end</var>, Set <var>hitsEnd</var> to <emu-val>true</emu-val>.</li><li>Set <var>currentCount</var> to <var>currentCount</var> + <var>one</var>.</li><li>If <var>ifIncrease</var> is <emu-val>true</emu-val>, then<ol><li><emu-xref href="#assert"><a href="https://tc39.es/ecma262/#assert">Assert</a></emu-xref>: <var>end</var> <emu-xref href="#sec-ecmascript-language-types-bigint-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-bigint-type">is a BigInt</a></emu-xref> or <emu-val>+∞</emu-val><sub>𝔽</sub> and <var>currentYieldingValue</var> <emu-xref href="#sec-ecmascript-language-types-bigint-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-bigint-type">is a BigInt</a></emu-xref>, or <var>end</var> <emu-xref href="#sec-ecmascript-language-types-number-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-number-type">is a Number</a></emu-xref> and
+                                <var>currentYieldingValue</var> <emu-xref href="#sec-ecmascript-language-types-number-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-number-type">is a Number</a></emu-xref>.</li><li>If <var>end</var> is not <emu-val>+∞</emu-val><sub>𝔽</sub>, then<ol><li>If <var>inclusiveEnd</var> is <emu-val>true</emu-val>, then<ol><li>If <var>currentYieldingValue</var> &gt; <var>end</var>, return <emu-val>undefined</emu-val>.</li></ol></li><li>Else,<ol><li>If <var>currentYieldingValue</var> ≥ <var>end</var>, return <emu-val>undefined</emu-val>.</li></ol></li></ol></li></ol></li><li>Else,<ol><li><emu-xref href="#assert"><a href="https://tc39.es/ecma262/#assert">Assert</a></emu-xref>: <var>end</var> <emu-xref href="#sec-ecmascript-language-types-bigint-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-bigint-type">is a BigInt</a></emu-xref> or <emu-val>-∞</emu-val><sub>𝔽</sub> and <var>currentYieldingValue</var> <emu-xref href="#sec-ecmascript-language-types-bigint-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-bigint-type">is a BigInt</a></emu-xref>, or <var>end</var> <emu-xref href="#sec-ecmascript-language-types-number-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-number-type">is a Number</a></emu-xref> and <var>currentYieldingValue</var> <emu-xref href="#sec-ecmascript-language-types-number-type"><a href="https://tc39.es/ecma262/#sec-ecmascript-language-types-number-type">is a Number</a></emu-xref>.</li><li>If <var>end</var> is not <emu-val>-∞</emu-val><sub>𝔽</sub>, then<ol><li>If <var>inclusiveEnd</var> is <emu-val>true</emu-val>, then<ol><li>If <var>end</var> &gt; <var>currentYieldingValue</var>, return <emu-val>undefined</emu-val>.</li></ol></li><li>Else,<ol><li>If <var>end</var> ≥ <var>currentYieldingValue</var>, return <emu-val>undefined</emu-val>.</li></ol></li></ol></li></ol></li><li>Perform ?&nbsp;<emu-xref aoid="Yield"><a href="https://tc39.es/ecma262/#sec-yield">Yield</a></emu-xref>(<var>currentYieldingValue</var>).</li></ol></li><li>Return <emu-val>undefined</emu-val>.</li></ol></li><li>Return <emu-xref aoid="CreateIteratorFromClosure"><a href="https://tc39.es/ecma262/#sec-createiteratorfromclosure">CreateIteratorFromClosure</a></emu-xref>(<var>closure</var>, <emu-val>"%NumericRangeIteratorPrototype%"</emu-val>, <emu-xref href="#sec-%numericrangeiteratorprototype%-object" id="_ref_3"><a href="#sec-%numericrangeiteratorprototype%-object">%NumericRangeIteratorPrototype%</a></emu-xref>).</li></ol></emu-alg>
             </emu-clause>
 
             <emu-clause id="sec-%numericrangeiteratorprototype%-object">
-                <h1><span class="secnum">27.1.3.2</span> The %NumericRangeIteratorPrototype% Object</h1>
+                <h1><span class="secnum">27.1.4.2</span> The %NumericRangeIteratorPrototype% Object</h1>
                 <p>The <dfn tabindex="-1">%NumericRangeIteratorPrototype%</dfn> object:</p>
                 <ul>
                     <li>has properties that are inherited by all <emu-xref href="#sec-numeric-range-iterator-object" id="_ref_4"><a href="#sec-numeric-range-iterator-object">NumericRangeIterator</a></emu-xref> Objects.</li>
@@ -3337,11 +3345,11 @@ <h1><span class="secnum">27.1.3.2</span> The %NumericRangeIteratorPrototype% Obj
                 </ul>
 
                 <emu-clause id="sec-properties-of-the-numericrangeiterator-prototype-object-next">
-                    <h1><span class="secnum">27.1.3.2.1</span> %NumericRangeIterator%.next ( )</h1>
+                    <h1><span class="secnum">27.1.4.2.1</span> %NumericRangeIterator%.next ( )</h1>
                     <emu-alg><ol><li>Return ?&nbsp;<emu-xref aoid="GeneratorResume"><a href="https://tc39.es/ecma262/#sec-generatorresume">GeneratorResume</a></emu-xref>(<emu-val>this</emu-val> value, <emu-const>empty</emu-const>, <emu-val>"%NumericRangeIteratorPrototype%"</emu-val>).</li></ol></emu-alg>
                 </emu-clause>
                 <emu-clause id="sec-properties-of-the-numericrangeiterator-prototype-object-@@tostringtag">
-                    <h1><span class="secnum">27.1.3.2.2</span> %NumericRangeIteratorPrototype%.[@@toStringTag]</h1>
+                    <h1><span class="secnum">27.1.4.2.2</span> %NumericRangeIteratorPrototype%.[@@toStringTag]</h1>
                     <p>The initial value of the @@toStringTag property is the String value <code>"NumericRangeIterator"</code>.</p>
                     <p>This property has the attributes { <var class="field">[[Writable]]</var>: <emu-val>false</emu-val>, <var class="field">[[Enumerable]]</var>: <emu-val>false</emu-val>, <var class="field">[[Configurable]]</var>: <emu-val>true</emu-val> }.</p>
                 </emu-clause>
diff --git a/polyfill.js b/polyfill.js
index a6e20be..7f89fc6 100644
--- a/polyfill.js
+++ b/polyfill.js
@@ -5,6 +5,14 @@ It _will_ be changed if the specification has changed.
 It should only be used to collect developers feedback about the APIs.`)
 // This polyfill requires: globalThis, BigInt, private fields
 ;(() => {
+    /**
+     * @param {*} condition
+     * @returns {asserts condition}
+     */
+    function assert(condition) {
+        if (!condition) throw new SpecAssertError()
+    }
+    class SpecAssertError extends Error {}
     const SpecValue = {
         BigIntRange: Symbol(),
         NumberRange: Symbol(),
@@ -32,7 +40,14 @@ It should only be used to collect developers feedback about the APIs.`)
      * @param {T} one
      */
     function* NumericRangeIteratorObject(start, end, step, inclusiveEnd, zero, one) {
-        let ifIncrease = end > start
+        let ifIncrease
+        if (end === Infinity) ifIncrease = true
+        else if (end === -Infinity) ifIncrease = false
+        else {
+            assert(typeof start === typeof end)
+            if (end > start) ifIncrease = true
+            else ifIncrease = false
+        }
         let ifStepIncrease = step > zero
         if (ifIncrease !== ifStepIncrease) return
         let hitsEnd = false
@@ -44,16 +59,28 @@ It should only be used to collect developers feedback about the APIs.`)
             currentCount = currentCount + one
             // ifIncrease && inclusiveEnd && currentYieldingValue > end
             if (ifIncrease) {
-                if (inclusiveEnd) {
-                    if (currentYieldingValue > end) return
-                } else {
-                    if (currentYieldingValue >= end) return
+                assert(
+                    ((end === Infinity || typeof end === "bigint") && typeof currentYieldingValue === "bigint") ||
+                        (typeof end === "number" && typeof currentYieldingValue === "number"),
+                )
+                if (end !== Infinity) {
+                    if (inclusiveEnd) {
+                        if (currentYieldingValue > end) return
+                    } else {
+                        if (currentYieldingValue >= end) return
+                    }
                 }
             } else {
-                if (inclusiveEnd) {
-                    if (end > currentYieldingValue) return
-                } else {
-                    if (end >= currentYieldingValue) return
+                assert(
+                    ((end === -Infinity || typeof end === "bigint") && typeof currentYieldingValue === "bigint") ||
+                        (typeof end === "number" && typeof currentYieldingValue === "number"),
+                )
+                if (end !== -Infinity) {
+                    if (inclusiveEnd) {
+                        if (end > currentYieldingValue) return
+                    } else {
+                        if (end >= currentYieldingValue) return
+                    }
                 }
             }
             yield currentYieldingValue
@@ -83,12 +110,12 @@ It should only be used to collect developers feedback about the APIs.`)
             /** @type {T} */ let zero
             /** @type {T} */ let one
             if (type === SpecValue.NumberRange) {
-                // Assert: start is number
+                assert(typeof start === "number")
                 if (typeof end !== "number") throw new TypeError() // @ts-ignore
                 zero = 0 // @ts-ignore
                 one = 1
             } else {
-                // Assert: end is bigint
+                assert(typeof start === "bigint")
                 // Allowing all kinds of number (number, bigint, decimals, ...) to range from a finite number to infinity.
                 if (!isInfinity(end) && typeof end !== "bigint") throw new TypeError() // @ts-expect-error
                 zero = 0n // @ts-expect-error
@@ -108,9 +135,15 @@ It should only be used to collect developers feedback about the APIs.`)
             else throw new TypeError()
             if (isNaN(step)) throw new RangeError()
             if (step === undefined || step === null) {
-                if (end > start)
+                if (end === Infinity)
                     step = one // @ts-ignore
-                else step = -one
+                else if (end === -Infinity) step = -one
+                else {
+                    assert(typeof end === typeof start)
+                    if (end > start)
+                        step = one // @ts-ignore
+                    else step = -one
+                }
             }
 
             if (type === SpecValue.NumberRange && typeof step !== "number") throw new TypeError()
diff --git a/spec.emu b/spec.emu
index d08b758..00fa962 100644
--- a/spec.emu
+++ b/spec.emu
@@ -18,16 +18,20 @@ contributors: Jack Works
     <emu-clause id="sec-iteration" number="1">
         <h1>Iteration</h1>
 
-        <emu-clause id="sec-properties-of-the-iterator-constructor" number="2">
-            <h1>Properties of the Iterator Constructor</h1>
+        <emu-clause id="sec-iterator-objects" number="3">
+            <h1>Iterator Objects</h1>
 
-            <emu-clause id="sec-iterator.range">
-                <h1>Iterator.range ( _start_, _end_, _optionOrStep_ )</h1>
-                <emu-alg>
-                    1. If _start_ is a Number, return ? CreateNumericRangeIterator(_start_, _end_, _optionOrStep_, ~number-range~).
-                    1. If _start_ is a BigInt, return ? CreateNumericRangeIterator(_start_, _end_, _optionOrStep_, ~bigint-range~).
-                    1. Throw a *TypeError* exception.
-                </emu-alg>
+            <emu-clause id="sec-properties-of-the-iterator-constructor" number="2">
+                <h1>Properties of the Iterator Constructor</h1>
+
+                <emu-clause id="sec-iterator.range" number="2">
+                    <h1>Iterator.range ( _start_, _end_, _optionOrStep_ )</h1>
+                    <emu-alg>
+                        1. If _start_ is a Number, return ? CreateNumericRangeIterator(_start_, _end_, _optionOrStep_, ~number-range~).
+                        1. If _start_ is a BigInt, return ? CreateNumericRangeIterator(_start_, _end_, _optionOrStep_, ~bigint-range~).
+                        1. Throw a *TypeError* exception.
+                    </emu-alg>
+                </emu-clause>
             </emu-clause>
         </emu-clause>
 
@@ -51,8 +55,8 @@ contributors: Jack Works
                     1. If _type_ is ~number-range~, then
                         1. Assert: _start_ is a Number.
                         1. If _end_ is not a Number, throw a *TypeError* exception.
-                        1. Let _zero_ be *0*<sub>ℤ</sub>.
-                        1. Let _one_ be *1*<sub>ℤ</sub>.
+                        1. Let _zero_ be *+0*<sub>𝔽</sub>.
+                        1. Let _one_ be *1*<sub>𝔽</sub>.
                     1. Else,
                         1. Assert: _start_ is a BigInt.
                         <emu-note type="editor">Allowing all kinds of number (bigint, decimals, ...) to range from a finite number to infinity.</emu-note>
@@ -73,7 +77,10 @@ contributors: Jack Works
                     1. Else,
                         1. Throw a *TypeError* exception.
                     1. If _step_ is *undefined* or *null*, then
-                        1. If _end_ &gt; _start_, let _step_ be _one_.
+                        1. If _end_ is *+∞*<sub>𝔽</sub>, let _step_ be _one_.
+                        1. Else if _end_ is *-∞*<sub>𝔽</sub>, let _step_ be -_one_.
+                        1. Assert: In the next branch, _end_ is a BigInt and _start_ is a BigInt, or _end_ is a Number and _start_ is a Number.
+                        1. Else if _end_ &gt; _start_, let _step_ be _one_.
                         1. Else let _step_ be -_one_.
                     1. If _step_ is *NaN*, throw a *RangeError* exception.
                     1. If _type_ is ~number-range~ and _step_ is not a Number, throw a *TypeError* exception.
@@ -81,11 +88,14 @@ contributors: Jack Works
                     1. If _step_ is *+∞*<sub>𝔽</sub> or *-∞*<sub>𝔽</sub>, throw a *RangeError* exception.
                     1. If _step_ is _zero_ and _start_ is not _end_, throw a *RangeError* exception.
                     1. Let _closure_ be a new Abstract Closure with no parameters that captures _start_, _end_, _step_, _inclusiveEnd_, _zero_, _one_ and performs the following steps when called:
-                        1. If _end_ &gt; _start_, let _ifIncrease_ be *true*.
+                        1. If _end_ is *+∞*<sub>𝔽</sub>, let _ifIncrease_ be *true*.
+                        1. Else if _end_ is *-∞*<sub>𝔽</sub>, let _ifIncrease_ be *false*.
+                        1. Assert: In the next branch, _end_ is a BigInt and _start_ is a BigInt, or _end_ is a Number and _start_ is a Number.
+                        1. Else if _end_ &gt; _start_, let _ifIncrease_ be *true*.
                         1. Else let _ifIncrease_ be *false*.
                         1. If _step_ &gt; _zero_, let _ifStepIncrease_ be *true*.
                         1. Else let _ifStepIncrease_ be *false*.
-                        1. If _ifIncrease_ is not _ifStepIncrease_, return *undefined*.
+                        1. If _ifIncrease_ is not _ifStepIncrease_, return *undefined*.
                         1. Let _hitsEnd_ be *false*.
                         1. Let _currentCount_ be _zero_.
                         1. NOTE: You can debug these steps at https://tc39.es/proposal-Number.range/playground.html .
@@ -94,15 +104,20 @@ contributors: Jack Works
                             1. If _currentYieldingValue_ is _end_, Set _hitsEnd_ to *true*.
                             1. Set _currentCount_ to _currentCount_ + _one_.
                             1. If _ifIncrease_ is *true*, then
-                                1. If _inclusiveEnd_ is *true*, then
-                                    1. If _currentYieldingValue_ &gt; _end_, return *undefined*.
-                                1. Else,
-                                    1. If _currentYieldingValue_ &ge; _end_, return *undefined*.
+                                1. Assert: _end_ is a BigInt or *+∞*<sub>𝔽</sub> and _currentYieldingValue_ is a BigInt, or _end_ is a Number and
+                                _currentYieldingValue_ is a Number.
+                                1. If _end_ is not *+∞*<sub>𝔽</sub>, then
+                                    1. If _inclusiveEnd_ is *true*, then
+                                        1. If _currentYieldingValue_ &gt; _end_, return *undefined*.
+                                    1. Else,
+                                        1. If _currentYieldingValue_ &ge; _end_, return *undefined*.
                             1. Else,
-                                1. If _inclusiveEnd_ is *true*, then
-                                    1. If _end_ &gt; _currentYieldingValue_, return *undefined*.
-                                1. Else,
-                                    1. If _end_ &ge; _currentYieldingValue_, return *undefined*.
+                                1. Assert: _end_ is a BigInt or *-∞*<sub>𝔽</sub> and _currentYieldingValue_ is a BigInt, or _end_ is a Number and _currentYieldingValue_ is a Number.
+                                1. If _end_ is not *-∞*<sub>𝔽</sub>, then
+                                    1. If _inclusiveEnd_ is *true*, then
+                                        1. If _end_ &gt; _currentYieldingValue_, return *undefined*.
+                                    1. Else,
+                                        1. If _end_ &ge; _currentYieldingValue_, return *undefined*.
                             1. Perform ? Yield(_currentYieldingValue_).
                         1. Return *undefined*.
                     1. Return CreateIteratorFromClosure(_closure_, *"%NumericRangeIteratorPrototype%"*, %NumericRangeIteratorPrototype%).