diff --git a/javascript-mjs/draft.md b/javascript-mjs/draft.md
index aa116e8..c802f17 100644
--- a/javascript-mjs/draft.md
+++ b/javascript-mjs/draft.md
@@ -132,6 +132,8 @@ The types defined in this document are applicable to scripts written in {{ECMA-2
 
 This document may be updated to take other content into account.  Updates of this document may introduce new optional parameters; implementations MUST consider the impact of such an update.
 
+This document does not define how fragment identifiers in resource identifiers ({{RFC3986}}, {{RFC3987}}) for documents labeled with one of the media types defined in this document are resolved.  An update of this document may define processing of fragment identifiers.
+
 The definitions in this document reflect the current state of implementation across the JavaScript ecosystem, in web browsers and other environments such as Node.js alike, in order to guarantee backwards compatibility with existing applications as much as possible.
 
 # Modules
@@ -144,8 +146,6 @@ Ecma International's Technical Committee 39 (TC39), the standards body in charge
 
 It is not possible to fully determine if a source text of ECMAScript is meant to be parsed using the Module or Script grammar goals based upon content or media type alone. Therefore, as permitted by the media types in this document, scripting environments use out-of-band information in order to determine what goal should be used. Some scripting environments have chosen to adopt the file extension of .mjs for this purpose.
 
-This document does not define how fragment identifiers in resource identifiers ({{RFC3986}}, {{RFC3987}}) for documents labeled with one of the media types defined in this document are resolved.  An update of this document may define processing of fragment identifiers.
-
 # Encoding
 
 Refer to {{RFC6365}} for a discussion of terminology used in this section.  Source text (as defined in {{ECMA-262}}, section "Source Text") can be binary source text.  Binary source text is a textual data object that represents source text encoded using a character encoding scheme.  A textual data object is a whole text protocol message or a whole text document, or a part of it, that is treated separately for purposes of external storage and retrieval.  An implementation's internal representation of source text is not considered binary source text.
@@ -196,13 +196,13 @@ Binary source text can be determined to have been encoded using a certain charac
 
 Refer to {{RFC3552}} for a discussion of terminology used in this section.  Examples in this section and discussions of interactions of host environments with scripts, modules, and extensions to {{ECMA-262}} are to be understood as non-exhaustive and of a purely illustrative nature.
 
-The programming language defined in {{ECMA-262}} is not intended to be computationally self-sufficient, rather it is expected that the computational environment provides facilities to programs to enable specific functionality.  Such facilities constitute unknown factors and are thus not defined by this document.
+The programming language defined in {{ECMA-262}} is not intended to be computationally self-sufficient, rather, it is expected that the computational environment provides facilities to programs to enable specific functionality.  Such facilities constitute unknown factors and are thus not defined by this document.
 
 Derived programming languages are permitted to include additional functionality that is not described in {{ECMA-262}}; such functionality constitutes an unknown factor and is thus not defined by this document.  In particular, extensions to {{ECMA-262}} defined for the JavaScript programming language are not discussed in this document.
 
 Uncontrolled execution of scripts can be exceedingly dangerous. Implementations that execute scripts MUST give consideration to their application's threat models and those of the individual features they implement; in particular, they MUST ensure that untrusted content is not executed in an unprotected environment.
 
-Module scripts in ECMAScript can request the fetching and processing of additional scripts, called importing.  Implementations that support modules need to process imported sources in the same way as scripts.  Further, there may be additional privacy and security concerns depending on the location(s) the original script and its imported modules are obtained from.  For instance, a script obtained from "host-a.example" could request to import a script from "host-b.example", which could expose information about the executing environment (e.g., IP address) to "host-b.example".  See the section "ECMAScript Language: Scripts and Modules" in {{ECMA-262}} for details.
+Module scripts in ECMAScript can request the fetching and processing of additional scripts, called importing. Implementations that support modules need to process imported sources in the same way as scripts. See the section "ECMAScript Language: Scripts and Modules" in {{ECMA-262}} for details. Further, there may be additional privacy and security concerns depending on the location(s) the original script and its imported modules are obtained from. For instance, a script obtained from "host-a.example" could request to import a script from "host-b.example", which could expose information about the executing environment (e.g., IP address) to "host-b.example".
 
 Specifications for host environment facilities and for derived programming languages should include security considerations.  If an implementation supports such facilities, the respective security considerations apply.  In particular, if scripts can be referenced from or included in specific document formats, the considerations for the embedding or referencing document format apply.
 
@@ -262,7 +262,7 @@ Encoding considerations:
 
 Security considerations:
 
-: See section 5 of \[this document]..
+: See section 5 of \[this document].
 
 Interoperability considerations:
 
@@ -304,7 +304,7 @@ Restrictions on usage:
 
 Author:
 
-: See Author's Address section of \[this document].
+: See Author's Address section of \[this document] and {{RFC4329}}.
 
 Change controller:
 
@@ -339,7 +339,7 @@ Encoding considerations:
 
 Security considerations:
 
-: See section 5 of \[this document]..
+: See section 5 of \[this document].
 
 Interoperability considerations:
 
@@ -382,7 +382,7 @@ Restrictions on usage:
 
 Author:
 
-: See Author's Address section of \[this document].
+: See Author's Address section of \[this document] and {{RFC4329}}.
 
 Change controller:
 
@@ -413,12 +413,11 @@ Encoding considerations:
 
 Security considerations:
 
-: See section 5 of \[this document]..
+: See section 5 of \[this document].
 
 Interoperability considerations:
 
-: It is expected that implementations will behave as if this registration applies to later editions of {{ECMA-262}}, and its published specification references may be updated accordingly from time to time. See also section 4.1 of \[this document] regarding the charset parameter.
-
+: It is expected that implementations will behave as if this registration applies to later editions of {{ECMA-262}}, and its published specification references may be updated accordingly from time to time. See also various sections of \[this document].
 
 Published specification:
 
@@ -457,11 +456,11 @@ Restrictions on usage:
 
 Author:
 
-: See Author's Address section of \[this document].
+: See Author's Address section of \[this document] and {{RFC4329}}.
 
 Change controller:
 
-: IESG \<iesg@ietf.org>.
+: IESG \<iesg@ietf.org\>
 
 
 ### application/x-ecmascript
@@ -488,7 +487,7 @@ Encoding considerations:
 
 Security considerations:
 
-: See section 5 of \[this document]..
+: See section 5 of \[this document].
 
 Interoperability considerations:
 
@@ -518,7 +517,7 @@ Additional information:
 
 Person & email address to contact for further information:
 
-: See Author's Address section of \[this document].
+: See Author's Address section of \[this document] and {{RFC4329}}.
 
 Intended usage:
 
@@ -531,7 +530,7 @@ Restrictions on usage:
 
 Author:
 
-: See Author's Address section of \[this document].
+: See Author's Address section of \[this document] and {{RFC4329}}.
 
 Change controller:
 
@@ -562,7 +561,7 @@ Encoding considerations:
 
 Security considerations:
 
-: See section 5 of \[this document]..
+: See section 5 of \[this document].
 
 Interoperability considerations:
 
@@ -592,7 +591,7 @@ Additional information:
 
 Person & email address to contact for further information:
 
-: See Author's Address section of \[this document].
+: See Author's Address section of \[this document] and {{RFC4329}}.
 
 Intended usage:
 
@@ -605,7 +604,7 @@ Restrictions on usage:
 
 Author:
 
-: See Author's Address section of \[this document].
+: See Author's Address section of \[this document] and {{RFC4329}}.
 
 Change controller:
 
@@ -636,7 +635,7 @@ Encoding considerations:
 
 Security considerations:
 
-: See section 5 of \[this document]..
+: See section 5 of \[this document].
 
 Interoperability considerations:
 
@@ -679,7 +678,7 @@ Restrictions on usage:
 
 Author:
 
-: See Author's Address section of \[this document].
+: See Author's Address section of \[this document] and {{RFC4329}}.
 
 Change controller:
 
@@ -710,7 +709,7 @@ Encoding considerations:
 
 Security considerations:
 
-: See section 5 of \[this document]..
+: See section 5 of \[this document].
 
 Interoperability considerations:
 
@@ -740,7 +739,7 @@ Additional information:
 
 Person & email address to contact for further information:
 
-: See Author's Address section of \[this document].
+: See Author's Address section of \[this document] and {{RFC4329}}.
 
 Intended usage:
 
@@ -753,7 +752,7 @@ Restrictions on usage:
 
 Author:
 
-: See Author's Address section of \[this document].
+: See Author's Address section of \[this document] and {{RFC4329}}.
 
 Change controller:
 
@@ -784,7 +783,7 @@ Encoding considerations:
 
 Security considerations:
 
-: See section 5 of \[this document]..
+: See section 5 of \[this document].
 
 Interoperability considerations:
 
@@ -814,7 +813,7 @@ Additional information:
 
 Person & email address to contact for further information:
 
-: See Author's Address section of \[this document].
+: See Author's Address section of \[this document] and {{RFC4329}}.
 
 Intended usage:
 
@@ -826,7 +825,7 @@ Restrictions on usage:
 
 Author:
 
-: See Author's Address section of \[this document].
+: See Author's Address section of \[this document] and {{RFC4329}}.
 
 Change controller:
 
@@ -857,7 +856,7 @@ Encoding considerations:
 
 Security considerations:
 
-: See section 5 of \[this document]..
+: See section 5 of \[this document].
 
 Interoperability considerations:
 
@@ -887,7 +886,7 @@ Additional information:
 
 Person & email address to contact for further information:
 
-: See Author's Address section of \[this document].
+: See Author's Address section of \[this document] and {{RFC4329}}.
 
 Intended usage:
 
@@ -899,7 +898,7 @@ Restrictions on usage:
 
 Author:
 
-: See Author's Address section of \[this document].
+: See Author's Address section of \[this document] and {{RFC4329}}.
 
 Change controller:
 
@@ -932,7 +931,7 @@ Encoding considerations:
 
 Security considerations:
 
-: See section 5 of \[this document]..
+: See section 5 of \[this document].
 
 Interoperability considerations:
 
@@ -962,7 +961,7 @@ Additional information:
 
 Person & email address to contact for further information:
 
-: See Author's Address section of \[this document].
+: See Author's Address section of \[this document] and {{RFC4329}}.
 
 Intended usage:
 
@@ -974,7 +973,7 @@ Restrictions on usage:
 
 Author:
 
-: See Author's Address section of \[this document].
+: See Author's Address section of \[this document] and {{RFC4329}}.
 
 Change controller:
 
@@ -1005,7 +1004,7 @@ Encoding considerations:
 
 Security considerations:
 
-: See section 5 of \[this document]..
+: See section 5 of \[this document].
 
 Interoperability considerations:
 
@@ -1035,7 +1034,7 @@ Additional information:
 
 Person & email address to contact for further information:
 
-: See Author's Address section of \[this document].
+: See Author's Address section of \[this document] and {{RFC4329}}.
 
 Intended usage:
 
@@ -1047,7 +1046,7 @@ Restrictions on usage:
 
 Author:
 
-: See Author's Address section of \[this document].
+: See Author's Address section of \[this document] and {{RFC4329}}.
 
 Change controller:
 
@@ -1078,7 +1077,7 @@ Encoding considerations:
 
 Security considerations:
 
-: See section 5 of \[this document]..
+: See section 5 of \[this document].
 
 Interoperability considerations:
 
@@ -1108,7 +1107,7 @@ Additional information:
 
 Person & email address to contact for further information:
 
-: See Author's Address section of \[this document].
+: See Author's Address section of \[this document] and {{RFC4329}}.
 
 Intended usage:
 
@@ -1120,7 +1119,7 @@ Restrictions on usage:
 
 Author:
 
-: See Author's Address section of \[this document].
+: See Author's Address section of \[this document] and {{RFC4329}}.
 
 Change controller:
 
@@ -1151,7 +1150,7 @@ Encoding considerations:
 
 Security considerations:
 
-: See section 5 of \[this document]..
+: See section 5 of \[this document].
 
 Interoperability considerations:
 
@@ -1181,7 +1180,7 @@ Additional information:
 
 Person & email address to contact for further information:
 
-: See Author's Address section of \[this document].
+: See Author's Address section of \[this document] and {{RFC4329}}.
 
 Intended usage:
 
@@ -1193,7 +1192,7 @@ Restrictions on usage:
 
 Author:
 
-: See Author's Address section of \[this document].
+: See Author's Address section of \[this document] and {{RFC4329}}.
 
 Change controller:
 
@@ -1224,11 +1223,11 @@ Encoding considerations:
 
 Security considerations:
 
-: See section 5 of \[this document]..
+: See section 5 of \[this document].
 
 Interoperability considerations:
 
-: See various sections of \[this document].
+: It is expected that implementations will behave as if this registration applies to later editions of {{ECMA-262}}, and its published specification references may be updated accordingly from time to time. See also various sections of \[this document].
 
 Published specification:
 
@@ -1254,7 +1253,7 @@ Additional information:
 
 Person & email address to contact for further information:
 
-: See Author's Address section of \[this document].
+: See Author's Address section of \[this document] and {{RFC4329}}.
 
 Intended usage:
 
@@ -1266,7 +1265,7 @@ Restrictions on usage:
 
 Author:
 
-: See Author's Address section of \[this document].
+: See Author's Address section of \[this document] and {{RFC4329}}.
 
 Change controller:
 
@@ -1297,7 +1296,7 @@ Encoding considerations:
 
 Security considerations:
 
-: See section 5 of \[this document]..
+: See section 5 of \[this document].
 
 Interoperability considerations:
 
@@ -1327,7 +1326,7 @@ Additional information:
 
 Person & email address to contact for further information:
 
-: See Author's Address section of \[this document].
+: See Author's Address section of \[this document] and {{RFC4329}}.
 
 Intended usage:
 
@@ -1339,7 +1338,7 @@ Restrictions on usage:
 
 Author:
 
-: See Author's Address section of \[this document].
+: See Author's Address section of \[this document] and {{RFC4329}}.
 
 Change controller:
 
@@ -1370,7 +1369,7 @@ Encoding considerations:
 
 Security considerations:
 
-: See section 5 of \[this document]..
+: See section 5 of \[this document].
 
 Interoperability considerations:
 
@@ -1400,7 +1399,7 @@ Additional information:
 
 Person & email address to contact for further information:
 
-: See Author's Address section of \[this document].
+: See Author's Address section of \[this document] and {{RFC4329}}.
 
 Intended usage:
 
@@ -1412,7 +1411,7 @@ Restrictions on usage:
 
 Author:
 
-: See Author's Address section of \[this document].
+: See Author's Address section of \[this document] and {{RFC4329}}.
 
 Change controller:
 
@@ -1429,6 +1428,7 @@ Alexey Melnikov,
 Allen Wirfs-Brock,
 Anne van Kesteren,
 Ben Campbell,
+Benjamin Kaduk,
 Éric Vyncke,
 Francesca Palombini,
 James Snell,