diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts
index 2db5c6695..647f72f1c 100644
--- a/baselines/dom.generated.d.ts
+++ b/baselines/dom.generated.d.ts
@@ -1921,6 +1921,9 @@ interface AbortController {
 
 declare var AbortController: {
     prototype: AbortController;
+    /**
+     * Returns a new controller whose signal is set to a newly created AbortSignal object.
+     */
     new(): AbortController;
 };
 
@@ -2127,12 +2130,29 @@ interface ApplicationCache extends EventTarget {
     onprogress: ((this: ApplicationCache, ev: ProgressEvent<ApplicationCache>) => any) | null;
     /** @deprecated */
     onupdateready: ((this: ApplicationCache, ev: Event) => any) | null;
+    /**
+     * Returns the current status of the application cache, as given by the constants defined below.
+     */
     /** @deprecated */
     readonly status: number;
+    /**
+     * Cancels the application cache download process.
+     * 
+     * This method is intended to be used by web application showing their own caching progress UI, in case the user wants to stop the update (e.g. because bandwidth is limited).
+     */
     /** @deprecated */
     abort(): void;
     /** @deprecated */
     swapCache(): void;
+    /**
+     * Invokes the application cache download process.
+     * 
+     * Throws an "InvalidStateError" DOMException if there is no application cache to update.
+     * 
+     * Calling this method is not usually necessary, as user agents will generally take care of updating application caches automatically.
+     * 
+     * The method can be useful in situations such as long-lived applications. For example, a web mail application might stay open in a browser tab for weeks at a time. Such an application could want to test for updates each day.
+     */
     /** @deprecated */
     update(): void;
     readonly CHECKING: number;
@@ -3277,14 +3297,23 @@ interface CanvasDrawImage {
 
 interface CanvasDrawPath {
     beginPath(): void;
+    /**
+     * Further constrains the clipping region to the current default path or the given path, using the given fill rule to determine what points are in the path.
+     */
     clip(fillRule?: CanvasFillRule): void;
     clip(path: Path2D, fillRule?: CanvasFillRule): void;
+    /**
+     * Fills the subpaths of the current default path or the given path with the current fill style, obeying the given fill rule.
+     */
     fill(fillRule?: CanvasFillRule): void;
     fill(path: Path2D, fillRule?: CanvasFillRule): void;
     isPointInPath(x: number, y: number, fillRule?: CanvasFillRule): boolean;
     isPointInPath(path: Path2D, x: number, y: number, fillRule?: CanvasFillRule): boolean;
     isPointInStroke(x: number, y: number): boolean;
     isPointInStroke(path: Path2D, x: number, y: number): boolean;
+    /**
+     * Strokes the subpaths of the current default path or the given path with the current stroke style.
+     */
     stroke(): void;
     stroke(path: Path2D): void;
 }
@@ -3298,6 +3327,11 @@ interface CanvasFillStrokeStyles {
 }
 
 interface CanvasFilters {
+    /**
+     * Returns the current filter.
+     * 
+     * Can be set, to change the filter. Values that cannot be parsed as a <filter-function-list> value are ignored.
+     */
     filter: string;
 }
 
@@ -3330,14 +3364,27 @@ interface CanvasImageSmoothing {
 }
 
 interface CanvasPath {
+    /**
+     * Adds points to the subpath such that the arc described by the circumference of the circle described by the arguments, starting at the given start angle and ending at the given end angle, going in the given direction (defaulting to clockwise), is added to the path, connected to the previous point by a straight line.
+     * 
+     * Throws an "IndexSizeError" DOMException if the given radius is negative.
+     */
     arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise?: boolean): void;
     arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): void;
     bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): void;
     closePath(): void;
+    /**
+     * Adds points to the subpath such that the arc described by the circumference of the ellipse described by the arguments, starting at the given start angle and ending at the given end angle, going in the given direction (defaulting to clockwise), is added to the path, connected to the previous point by a straight line.
+     * 
+     * Throws an "IndexSizeError" DOMException if the given radius is negative.
+     */
     ellipse(x: number, y: number, radiusX: number, radiusY: number, rotation: number, startAngle: number, endAngle: number, anticlockwise?: boolean): void;
     lineTo(x: number, y: number): void;
     moveTo(x: number, y: number): void;
     quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void;
+    /**
+     * Adds a new closed subpath to the path, representing the given rectangle.
+     */
     rect(x: number, y: number, w: number, h: number): void;
 }
 
@@ -3372,6 +3419,9 @@ interface CanvasRect {
 
 /** The CanvasRenderingContext2D interface, part of the Canvas API, provides the 2D rendering context for the drawing surface of a <canvas> element. It is used for drawing shapes, text, images, and other objects. */
 interface CanvasRenderingContext2D extends CanvasCompositing, CanvasDrawImage, CanvasDrawPath, CanvasFillStrokeStyles, CanvasFilters, CanvasImageData, CanvasImageSmoothing, CanvasPath, CanvasPathDrawingStyles, CanvasRect, CanvasShadowStyles, CanvasState, CanvasText, CanvasTextDrawingStyles, CanvasTransform, CanvasUserInterface {
+    /**
+     * Returns the canvas element.
+     */
     readonly canvas: HTMLCanvasElement;
 }
 
@@ -3388,7 +3438,13 @@ interface CanvasShadowStyles {
 }
 
 interface CanvasState {
+    /**
+     * Pops the top state on the stack, restoring the context to that state.
+     */
     restore(): void;
+    /**
+     * Pushes the current state onto the stack.
+     */
     save(): void;
 }
 
@@ -3399,7 +3455,19 @@ interface CanvasText {
 }
 
 interface CanvasTextDrawingStyles {
+    /**
+     * Returns the current directionality.
+     * 
+     * Can be set, to change the directionality. The possible values and their meanings are given below. Other values are ignored. The default is "inherit".
+     */
     direction: CanvasDirection;
+    /**
+     * Returns the current font settings.
+     * 
+     * Can be set, to change the font. The syntax is the same as for the CSS 'font' property; values that cannot be parsed as CSS font values are ignored.
+     * 
+     * Relative keywords and lengths are computed relative to the font of the canvas element.
+     */
     font: string;
     textAlign: CanvasTextAlign;
     textBaseline: CanvasTextBaseline;
@@ -3408,11 +3476,23 @@ interface CanvasTextDrawingStyles {
 interface CanvasTransform {
     getTransform(): DOMMatrix;
     resetTransform(): void;
+    /**
+     * Changes the current transformation matrix to apply a rotation transformation with the given characteristics. The angle is in radians.
+     */
     rotate(angle: number): void;
+    /**
+     * Changes the current transformation matrix to apply a scaling transformation with the given characteristics.
+     */
     scale(x: number, y: number): void;
     setTransform(a: number, b: number, c: number, d: number, e: number, f: number): void;
     setTransform(transform?: DOMMatrix2DInit): void;
+    /**
+     * Changes the current transformation matrix to apply the matrix given by the arguments as described below.
+     */
     transform(a: number, b: number, c: number, d: number, e: number, f: number): void;
+    /**
+     * Changes the current transformation matrix to apply a translation transformation with the given characteristics.
+     */
     translate(x: number, y: number): void;
 }
 
@@ -3566,6 +3646,9 @@ interface Comment extends CharacterData {
 
 declare var Comment: {
     prototype: Comment;
+    /**
+     * Returns a new Comment node whose data is data.
+     */
     new(data?: string): Comment;
 };
 
@@ -3702,6 +3785,9 @@ interface CustomEvent<T = any> extends Event {
 
 declare var CustomEvent: {
     prototype: CustomEvent;
+    /**
+     * Works analogously to the constructor for Event except that the eventInitDict argument now allows for setting the detail attribute too.
+     */
     new<T>(typeArg: string, eventInitDict?: CustomEventInit<T>): CustomEvent<T>;
 };
 
@@ -3918,6 +4004,9 @@ interface DOMParser {
 
 declare var DOMParser: {
     prototype: DOMParser;
+    /**
+     * Constructs a new DOMParser object.
+     */
     new(): DOMParser;
 };
 
@@ -4846,6 +4935,9 @@ interface Document extends Node, DocumentAndElementEventHandlers, DocumentOrShad
 
 declare var Document: {
     prototype: Document;
+    /**
+     * Returns a new document.
+     */
     new(): Document;
 };
 
@@ -4954,6 +5046,9 @@ interface DocumentFragment extends Node, NonElementParentNode, ParentNode {
 
 declare var DocumentFragment: {
     prototype: DocumentFragment;
+    /**
+     * Returns a new DocumentFragment node.
+     */
     new(): DocumentFragment;
 };
 
@@ -5312,6 +5407,9 @@ interface Event {
 
 declare var Event: {
     prototype: Event;
+    /**
+     * Returns a new event whose type attribute value is set to type. The eventInitDict argument allows for setting the bubbles and cancelable attributes via object members of the same name.
+     */
     new(type: string, eventInitDict?: EventInit): Event;
     readonly AT_TARGET: number;
     readonly BUBBLING_PHASE: number;
@@ -5394,6 +5492,9 @@ interface EventTarget {
 
 declare var EventTarget: {
     prototype: EventTarget;
+    /**
+     * Creates a new EventTarget object, which can be used by developers to dispatch and listen for events.
+     */
     new(): EventTarget;
 };
 
@@ -6498,6 +6599,9 @@ declare var HTMLDataElement: {
 
 /** Provides special properties (beyond the HTMLElement object interface it also has available to it by inheritance) to manipulate <datalist> elements and their content. */
 interface HTMLDataListElement extends HTMLElement {
+    /**
+     * Returns an HTMLCollection of the option elements of the datalist element.
+     */
     readonly options: HTMLCollectionOf<HTMLOptionElement>;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLDataListElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -6526,7 +6630,15 @@ declare var HTMLDetailsElement: {
 interface HTMLDialogElement extends HTMLElement {
     open: boolean;
     returnValue: string;
+    /**
+     * Closes the dialog element.
+     * 
+     * The argument, if provided, provides a return value.
+     */
     close(returnValue?: string): void;
+    /**
+     * Displays the dialog element.
+     */
     show(): void;
     showModal(): void;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLDialogElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
@@ -6655,12 +6767,18 @@ declare var HTMLEmbedElement: {
 /** Provides special properties and methods (beyond the regular HTMLElement interface it also has available to it by inheritance) for manipulating the layout and presentation of <fieldset> elements. */
 interface HTMLFieldSetElement extends HTMLElement {
     disabled: boolean;
+    /**
+     * Returns an HTMLCollection of the form controls in the element.
+     */
     readonly elements: HTMLCollection;
     /**
      * Retrieves a reference to the form that the object is embedded in.
      */
     readonly form: HTMLFormElement | null;
     name: string;
+    /**
+     * Returns the string "fieldset".
+     */
     readonly type: string;
     /**
      * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting.
@@ -6974,17 +7092,70 @@ declare var HTMLHtmlElement: {
 };
 
 interface HTMLHyperlinkElementUtils {
+    /**
+     * Returns the hyperlink's URL's fragment (includes leading "#" if non-empty).
+     * 
+     * Can be set, to change the URL's fragment (ignores leading "#").
+     */
     hash: string;
+    /**
+     * Returns the hyperlink's URL's host and port (if different from the default port for the scheme).
+     * 
+     * Can be set, to change the URL's host and port.
+     */
     host: string;
+    /**
+     * Returns the hyperlink's URL's host.
+     * 
+     * Can be set, to change the URL's host.
+     */
     hostname: string;
+    /**
+     * Returns the hyperlink's URL.
+     * 
+     * Can be set, to change the URL.
+     */
     href: string;
     toString(): string;
+    /**
+     * Returns the hyperlink's URL's origin.
+     */
     readonly origin: string;
+    /**
+     * Returns the hyperlink's URL's password.
+     * 
+     * Can be set, to change the URL's password.
+     */
     password: string;
+    /**
+     * Returns the hyperlink's URL's path.
+     * 
+     * Can be set, to change the URL's path.
+     */
     pathname: string;
+    /**
+     * Returns the hyperlink's URL's port.
+     * 
+     * Can be set, to change the URL's port.
+     */
     port: string;
+    /**
+     * Returns the hyperlink's URL's scheme.
+     * 
+     * Can be set, to change the URL's scheme.
+     */
     protocol: string;
+    /**
+     * Returns the hyperlink's URL's query (includes leading "?" if non-empty).
+     * 
+     * Can be set, to change the URL's query (ignores leading "?").
+     */
     search: string;
+    /**
+     * Returns the hyperlink's URL's username.
+     * 
+     * Can be set, to change the URL's username.
+     */
     username: string;
 }
 
@@ -7221,6 +7392,9 @@ interface HTMLInputElement extends HTMLElement {
      * Sets or retrieves the height of the object.
      */
     height: number;
+    /**
+     * When set, overrides the rendering of checkbox controls so that the current value is not visible.
+     */
     indeterminate: boolean;
     readonly labels: NodeListOf<HTMLLabelElement> | null;
     /**
@@ -7381,6 +7555,9 @@ declare var HTMLLIElement: {
 
 /** Gives access to properties specific to <label> elements. It inherits methods and properties from the base HTMLElement interface. */
 interface HTMLLabelElement extends HTMLElement {
+    /**
+     * Returns the form control that is associated with this element.
+     */
     readonly control: HTMLElement | null;
     /**
      * Retrieves a reference to the form that the object is embedded in.
@@ -8019,9 +8196,17 @@ interface HTMLOutputElement extends HTMLElement {
     readonly htmlFor: DOMTokenList;
     readonly labels: NodeListOf<HTMLLabelElement>;
     name: string;
+    /**
+     * Returns the string "output".
+     */
     readonly type: string;
     readonly validationMessage: string;
     readonly validity: ValidityState;
+    /**
+     * Returns the element's current value.
+     * 
+     * Can be set, to change the value.
+     */
     value: string;
     readonly willValidate: boolean;
     checkValidity(): boolean;
@@ -8231,6 +8416,9 @@ interface HTMLSelectElement extends HTMLElement {
      * Sets or retrieves the name of the object.
      */
     name: string;
+    /**
+     * Returns an HTMLOptionsCollection of the list of options.
+     */
     readonly options: HTMLOptionsCollection;
     /**
      * When present, marks an element that can't be submitted without a value.
@@ -8733,6 +8921,9 @@ declare var HTMLTableSectionElement: {
 
 /** Enables access to the contents of an HTML <template> element. */
 interface HTMLTemplateElement extends HTMLElement {
+    /**
+     * Returns the template contents (a DocumentFragment).
+     */
     readonly content: DocumentFragment;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTemplateElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -8895,6 +9086,9 @@ interface HTMLTrackElement extends HTMLElement {
     readonly readyState: number;
     src: string;
     srclang: string;
+    /**
+     * Returns the TextTrack object corresponding to the text track of the track element.
+     */
     readonly track: TextTrack;
     readonly ERROR: number;
     readonly LOADED: number;
@@ -10591,6 +10785,9 @@ interface MutationObserver {
 
 declare var MutationObserver: {
     prototype: MutationObserver;
+    /**
+     * Constructs a MutationObserver object and sets its callback to callback. The callback is invoked with a list of MutationRecord objects as first argument and the constructed MutationObserver object as second argument. It is invoked after nodes registered with the observe() method, are mutated.
+     */
     new(callback: MutationCallback): MutationObserver;
 };
 
@@ -12464,6 +12661,9 @@ interface Range extends AbstractRange {
 
 declare var Range: {
     prototype: Range;
+    /**
+     * Returns a new live range.
+     */
     new(): Range;
     readonly END_TO_END: number;
     readonly END_TO_START: number;
@@ -15281,6 +15481,9 @@ interface StaticRange extends AbstractRange {
 
 declare var StaticRange: {
     prototype: StaticRange;
+    /**
+     * Returns a new range object that does not update when the node tree mutates.
+     */
     new(init: StaticRangeInit): StaticRange;
 };
 
@@ -15297,29 +15500,35 @@ declare var StereoPannerNode: {
 /** This Web Storage API interface provides access to a particular domain's session or local storage. It allows, for example, the addition, modification, or deletion of stored data items. */
 interface Storage {
     /**
-     * Returns the number of key/value pairs currently present in the list associated with the object.
+     * Returns the number of key/value pairs.
      */
     readonly length: number;
     /**
-     * Empties the list associated with the object of all key/value pairs, if there are any.
+     * Removes all key/value pairs, if there are any.
+     * 
+     * Dispatches a storage event on Window objects holding an equivalent Storage object.
      */
     clear(): void;
     /**
-     * Returns the current value associated with the given key, or null if the given key does not exist in the list associated with the object.
+     * Returns the current value associated with the given key, or null if the given key does not exist.
      */
     getItem(key: string): string | null;
     /**
-     * Returns the name of the nth key in the list, or null if n is greater than or equal to the number of key/value pairs in the object.
+     * Returns the name of the nth key, or null if n is greater than or equal to the number of key/value pairs.
      */
     key(index: number): string | null;
     /**
-     * Removes the key/value pair with the given key from the list associated with the object, if a key/value pair with the given key exists.
+     * Removes the key/value pair with the given key, if a key/value pair with the given key exists.
+     * 
+     * Dispatches a storage event on Window objects holding an equivalent Storage object.
      */
     removeItem(key: string): void;
     /**
      * Sets the value of the pair identified by key to value, creating a new key/value pair if none existed for key previously.
      * 
      * Throws a "QuotaExceededError" DOMException exception if the new value couldn't be set. (Setting could fail if, e.g., the user has disabled storage for the site, or if the quota has been exceeded.)
+     * 
+     * Dispatches a storage event on Window objects holding an equivalent Storage object.
      */
     setItem(key: string, value: string): void;
     [name: string]: any;
@@ -15461,20 +15670,23 @@ interface Text extends CharacterData, Slottable {
 
 declare var Text: {
     prototype: Text;
+    /**
+     * Returns a new Text node whose data is data.
+     */
     new(data?: string): Text;
 };
 
 /** A decoder for a specific method, that is a specific character encoding, like utf-8, iso-8859-2, koi8, cp1261, gbk, etc. A decoder takes a stream of bytes as input and emits a stream of code points. For a more scalable, non-native library, see StringView – a C-like representation of strings based on typed arrays. */
 interface TextDecoder extends TextDecoderCommon {
     /**
-     * Returns the result of running encoding's decoder. The method can be invoked zero or more times with options's stream set to true, and then once without options's stream (or set to false), to process a fragmented stream. If the invocation without options's stream (or set to false) has no input, it's clearest to omit both arguments.
+     * Returns the result of running encoding's decoder. The method can be invoked zero or more times with options's stream set to true, and then once without options's stream (or set to false), to process a fragmented input. If the invocation without options's stream (or set to false) has no input, it's clearest to omit both arguments.
      * 
      * ```
      * var string = "", decoder = new TextDecoder(encoding), buffer;
      * while(buffer = next_chunk()) {
      *   string += decoder.decode(buffer, {stream:true});
      * }
-     * string += decoder.decode(); // end-of-stream
+     * string += decoder.decode(); // end-of-queue
      * ```
      * 
      * If the error mode is "fatal" and encoding's decoder returns error, throws a TypeError.
@@ -15493,11 +15705,11 @@ interface TextDecoderCommon {
      */
     readonly encoding: string;
     /**
-     * Returns true if error mode is "fatal", and false otherwise.
+     * Returns true if error mode is "fatal", otherwise false.
      */
     readonly fatal: boolean;
     /**
-     * Returns true if ignore BOM flag is set, and false otherwise.
+     * Returns the value of ignore BOM.
      */
     readonly ignoreBOM: boolean;
 }
@@ -15519,7 +15731,7 @@ interface TextEncoder extends TextEncoderCommon {
      */
     encode(input?: string): Uint8Array;
     /**
-     * Runs the UTF-8 encoder on source, stores the result of that operation into destination, and returns the progress made as a dictionary whereby read is the number of converted code units of source and written is the number of bytes modified in destination.
+     * Runs the UTF-8 encoder on source, stores the result of that operation into destination, and returns the progress made as an object wherein read is the number of converted code units of source and written is the number of bytes modified in destination.
      */
     encodeInto(source: string, destination: Uint8Array): TextEncoderEncodeIntoResult;
 }
diff --git a/baselines/webworker.generated.d.ts b/baselines/webworker.generated.d.ts
index f24219da5..7df3676a6 100644
--- a/baselines/webworker.generated.d.ts
+++ b/baselines/webworker.generated.d.ts
@@ -593,6 +593,9 @@ interface AbortController {
 
 declare var AbortController: {
     prototype: AbortController;
+    /**
+     * Returns a new controller whose signal is set to a newly created AbortSignal object.
+     */
     new(): AbortController;
 };
 
@@ -753,14 +756,23 @@ interface CanvasDrawImage {
 
 interface CanvasDrawPath {
     beginPath(): void;
+    /**
+     * Further constrains the clipping region to the current default path or the given path, using the given fill rule to determine what points are in the path.
+     */
     clip(fillRule?: CanvasFillRule): void;
     clip(path: Path2D, fillRule?: CanvasFillRule): void;
+    /**
+     * Fills the subpaths of the current default path or the given path with the current fill style, obeying the given fill rule.
+     */
     fill(fillRule?: CanvasFillRule): void;
     fill(path: Path2D, fillRule?: CanvasFillRule): void;
     isPointInPath(x: number, y: number, fillRule?: CanvasFillRule): boolean;
     isPointInPath(path: Path2D, x: number, y: number, fillRule?: CanvasFillRule): boolean;
     isPointInStroke(x: number, y: number): boolean;
     isPointInStroke(path: Path2D, x: number, y: number): boolean;
+    /**
+     * Strokes the subpaths of the current default path or the given path with the current stroke style.
+     */
     stroke(): void;
     stroke(path: Path2D): void;
 }
@@ -774,6 +786,11 @@ interface CanvasFillStrokeStyles {
 }
 
 interface CanvasFilters {
+    /**
+     * Returns the current filter.
+     * 
+     * Can be set, to change the filter. Values that cannot be parsed as a <filter-function-list> value are ignored.
+     */
     filter: string;
 }
 
@@ -806,14 +823,27 @@ interface CanvasImageSmoothing {
 }
 
 interface CanvasPath {
+    /**
+     * Adds points to the subpath such that the arc described by the circumference of the circle described by the arguments, starting at the given start angle and ending at the given end angle, going in the given direction (defaulting to clockwise), is added to the path, connected to the previous point by a straight line.
+     * 
+     * Throws an "IndexSizeError" DOMException if the given radius is negative.
+     */
     arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise?: boolean): void;
     arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): void;
     bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): void;
     closePath(): void;
+    /**
+     * Adds points to the subpath such that the arc described by the circumference of the ellipse described by the arguments, starting at the given start angle and ending at the given end angle, going in the given direction (defaulting to clockwise), is added to the path, connected to the previous point by a straight line.
+     * 
+     * Throws an "IndexSizeError" DOMException if the given radius is negative.
+     */
     ellipse(x: number, y: number, radiusX: number, radiusY: number, rotation: number, startAngle: number, endAngle: number, anticlockwise?: boolean): void;
     lineTo(x: number, y: number): void;
     moveTo(x: number, y: number): void;
     quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void;
+    /**
+     * Adds a new closed subpath to the path, representing the given rectangle.
+     */
     rect(x: number, y: number, w: number, h: number): void;
 }
 
@@ -854,7 +884,13 @@ interface CanvasShadowStyles {
 }
 
 interface CanvasState {
+    /**
+     * Pops the top state on the stack, restoring the context to that state.
+     */
     restore(): void;
+    /**
+     * Pushes the current state onto the stack.
+     */
     save(): void;
 }
 
@@ -865,7 +901,19 @@ interface CanvasText {
 }
 
 interface CanvasTextDrawingStyles {
+    /**
+     * Returns the current directionality.
+     * 
+     * Can be set, to change the directionality. The possible values and their meanings are given below. Other values are ignored. The default is "inherit".
+     */
     direction: CanvasDirection;
+    /**
+     * Returns the current font settings.
+     * 
+     * Can be set, to change the font. The syntax is the same as for the CSS 'font' property; values that cannot be parsed as CSS font values are ignored.
+     * 
+     * Relative keywords and lengths are computed relative to the font of the canvas element.
+     */
     font: string;
     textAlign: CanvasTextAlign;
     textBaseline: CanvasTextBaseline;
@@ -874,11 +922,23 @@ interface CanvasTextDrawingStyles {
 interface CanvasTransform {
     getTransform(): DOMMatrix;
     resetTransform(): void;
+    /**
+     * Changes the current transformation matrix to apply a rotation transformation with the given characteristics. The angle is in radians.
+     */
     rotate(angle: number): void;
+    /**
+     * Changes the current transformation matrix to apply a scaling transformation with the given characteristics.
+     */
     scale(x: number, y: number): void;
     setTransform(a: number, b: number, c: number, d: number, e: number, f: number): void;
     setTransform(transform?: DOMMatrix2DInit): void;
+    /**
+     * Changes the current transformation matrix to apply the matrix given by the arguments as described below.
+     */
     transform(a: number, b: number, c: number, d: number, e: number, f: number): void;
+    /**
+     * Changes the current transformation matrix to apply a translation transformation with the given characteristics.
+     */
     translate(x: number, y: number): void;
 }
 
@@ -984,6 +1044,9 @@ interface CustomEvent<T = any> extends Event {
 
 declare var CustomEvent: {
     prototype: CustomEvent;
+    /**
+     * Works analogously to the constructor for Event except that the eventInitDict argument now allows for setting the detail attribute too.
+     */
     new<T>(typeArg: string, eventInitDict?: CustomEventInit<T>): CustomEvent<T>;
 };
 
@@ -1405,6 +1468,9 @@ interface Event {
 
 declare var Event: {
     prototype: Event;
+    /**
+     * Returns a new event whose type attribute value is set to type. The eventInitDict argument allows for setting the bubbles and cancelable attributes via object members of the same name.
+     */
     new(type: string, eventInitDict?: EventInit): Event;
     readonly AT_TARGET: number;
     readonly BUBBLING_PHASE: number;
@@ -1487,6 +1553,9 @@ interface EventTarget {
 
 declare var EventTarget: {
     prototype: EventTarget;
+    /**
+     * Creates a new EventTarget object, which can be used by developers to dispatch and listen for events.
+     */
     new(): EventTarget;
 };
 
@@ -3108,14 +3177,14 @@ declare var SyncManager: {
 /** A decoder for a specific method, that is a specific character encoding, like utf-8, iso-8859-2, koi8, cp1261, gbk, etc. A decoder takes a stream of bytes as input and emits a stream of code points. For a more scalable, non-native library, see StringView – a C-like representation of strings based on typed arrays. */
 interface TextDecoder extends TextDecoderCommon {
     /**
-     * Returns the result of running encoding's decoder. The method can be invoked zero or more times with options's stream set to true, and then once without options's stream (or set to false), to process a fragmented stream. If the invocation without options's stream (or set to false) has no input, it's clearest to omit both arguments.
+     * Returns the result of running encoding's decoder. The method can be invoked zero or more times with options's stream set to true, and then once without options's stream (or set to false), to process a fragmented input. If the invocation without options's stream (or set to false) has no input, it's clearest to omit both arguments.
      * 
      * ```
      * var string = "", decoder = new TextDecoder(encoding), buffer;
      * while(buffer = next_chunk()) {
      *   string += decoder.decode(buffer, {stream:true});
      * }
-     * string += decoder.decode(); // end-of-stream
+     * string += decoder.decode(); // end-of-queue
      * ```
      * 
      * If the error mode is "fatal" and encoding's decoder returns error, throws a TypeError.
@@ -3134,11 +3203,11 @@ interface TextDecoderCommon {
      */
     readonly encoding: string;
     /**
-     * Returns true if error mode is "fatal", and false otherwise.
+     * Returns true if error mode is "fatal", otherwise false.
      */
     readonly fatal: boolean;
     /**
-     * Returns true if ignore BOM flag is set, and false otherwise.
+     * Returns the value of ignore BOM.
      */
     readonly ignoreBOM: boolean;
 }
@@ -3160,7 +3229,7 @@ interface TextEncoder extends TextEncoderCommon {
      */
     encode(input?: string): Uint8Array;
     /**
-     * Runs the UTF-8 encoder on source, stores the result of that operation into destination, and returns the progress made as a dictionary whereby read is the number of converted code units of source and written is the number of bytes modified in destination.
+     * Runs the UTF-8 encoder on source, stores the result of that operation into destination, and returns the progress made as an object wherein read is the number of converted code units of source and written is the number of bytes modified in destination.
      */
     encodeInto(source: string, destination: Uint8Array): TextEncoderEncodeIntoResult;
 }
@@ -5469,6 +5538,9 @@ interface WorkerGlobalScope extends EventTarget, WindowOrWorkerGlobalScope {
      * Returns workerGlobal's WorkerLocation object.
      */
     readonly location: WorkerLocation;
+    /**
+     * Returns workerGlobal's WorkerNavigator object.
+     */
     readonly navigator: WorkerNavigator;
     onerror: ((this: WorkerGlobalScope, ev: ErrorEvent) => any) | null;
     onlanguagechange: ((this: WorkerGlobalScope, ev: Event) => any) | null;
@@ -5923,6 +5995,9 @@ declare function dispatchEvent(event: Event): boolean;
  * Returns workerGlobal's WorkerLocation object.
  */
 declare var location: WorkerLocation;
+/**
+ * Returns workerGlobal's WorkerNavigator object.
+ */
 declare var navigator: WorkerNavigator;
 declare var onerror: ((this: DedicatedWorkerGlobalScope, ev: ErrorEvent) => any) | null;
 declare var onlanguagechange: ((this: DedicatedWorkerGlobalScope, ev: Event) => any) | null;
diff --git a/inputfiles/idl/DOM.commentmap.json b/inputfiles/idl/DOM.commentmap.json
index 75b363831..08c110c73 100644
--- a/inputfiles/idl/DOM.commentmap.json
+++ b/inputfiles/idl/DOM.commentmap.json
@@ -1,5 +1,5 @@
 {
-    "event-event": "Returns a new event whose type attribute value is set to type. The eventInitDict argument allows for setting the bubbles and cancelable attributes via object members of the same name.",
+    "event-constructor": "Returns a new event whose type attribute value is set to type. The eventInitDict argument allows for setting the bubbles and cancelable attributes via object members of the same name.",
     "event-type": "Returns the type of event, e.g. \"click\", \"hashchange\", or \"submit\".",
     "event-target": "Returns the object to which event is dispatched (its target).",
     "event-currenttarget": "Returns the object whose event listener's callback is currently being invoked.",
@@ -14,13 +14,13 @@
     "event-composed": "Returns true or false depending on how event was initialized. True if event invokes listeners past a ShadowRoot node that is the root of its target, and false otherwise.",
     "event-istrusted": "Returns true if event was dispatched by the user agent, and false otherwise.",
     "event-timestamp": "Returns the event's timestamp as the number of milliseconds measured relative to the time origin.",
-    "customevent-customevent": "Works analogously to the constructor for Event except that the eventInitDict argument now allows for setting the detail attribute too.",
+    "customevent-constructor": "Works analogously to the constructor for Event except that the eventInitDict argument now allows for setting the detail attribute too.",
     "customevent-detail": "Returns any custom data event was created with. Typically used for synthetic events.",
-    "eventtarget-eventtarget": "Creates a new EventTarget object, which can be used by developers to dispatch and listen for events.",
+    "eventtarget-constructor": "Creates a new EventTarget object, which can be used by developers to dispatch and listen for events.",
     "eventtarget-addeventlistener": "Appends an event listener for events whose type attribute value is type. The callback argument sets the callback that will be invoked when the event is dispatched.\n\nThe options argument sets listener-specific options. For compatibility this can be a boolean, in which case the method behaves exactly as if the value was specified as options's capture.\n\nWhen set to true, options's capture prevents callback from being invoked when the event's eventPhase attribute value is BUBBLING_PHASE. When false (or not present), callback will not be invoked when event's eventPhase attribute value is CAPTURING_PHASE. Either way, callback will be invoked if event's eventPhase attribute value is AT_TARGET.\n\nWhen set to true, options's passive indicates that the callback will not cancel the event by invoking preventDefault(). This is used to enable performance optimizations described in § 2.8 Observing event listeners.\n\nWhen set to true, options's once indicates that the callback will only be invoked once after which the event listener will be removed.\n\nThe event listener is appended to target's event listener list and is not appended if it has the same type, callback, and capture.",
     "eventtarget-removeeventlistener": "Removes the event listener in target's event listener list with the same type, callback, and options.",
     "eventtarget-dispatchevent": "Dispatches a synthetic event event to target and returns true if either event's cancelable attribute value is false or its preventDefault() method was not invoked, and false otherwise.",
-    "abortcontroller-abortcontroller": "Returns a new controller whose signal is set to a newly created AbortSignal object.",
+    "abortcontroller-constructor": "Returns a new controller whose signal is set to a newly created AbortSignal object.",
     "abortcontroller-signal": "Returns the AbortSignal object associated with this object.",
     "abortcontroller-abort": "Invoking this method will set this object's AbortSignal's aborted flag and signal to any observers that the associated activity is to be aborted.",
     "abortsignal-aborted": "Returns true if this AbortSignal's AbortController has signaled to abort, and false otherwise.",
@@ -44,7 +44,7 @@
     "htmlcollection-length": "Returns the number of elements in the collection.",
     "htmlcollection-item": "Returns the element with index index from the collection. The elements are sorted in tree order.",
     "htmlcollection-nameditem": "Returns the first element with ID or name name from the collection.",
-    "mutationobserver-mutationobserver": "Constructs a MutationObserver object and sets its callback to callback. The callback is invoked with a list of MutationRecord objects as first argument and the constructed MutationObserver object as second argument. It is invoked after nodes registered with the observe() method, are mutated.",
+    "mutationobserver-constructor": "Constructs a MutationObserver object and sets its callback to callback. The callback is invoked with a list of MutationRecord objects as first argument and the constructed MutationObserver object as second argument. It is invoked after nodes registered with the observe() method, are mutated.",
     "mutationobserver-observe": "Instructs the user agent to observe a given target (a node) and report any mutations based on the criteria given by options (an object).\n\nThe options argument allows for setting mutation observation options via object members. These are the object members that can be used:",
     "mutationobserver-disconnect": "Stops observer from observing any mutations. Until the observe() method is used again, observer's callback will not be invoked.",
     "mutationobserver-takerecords": "Empties the record queue and returns what was in there.",
@@ -76,7 +76,7 @@
     "node-isequalnode": "Returns whether node and otherNode have the same properties.",
     "node-comparedocumentposition": "Returns a bitmask indicating the position of other relative to node. These are the bits that can be set:",
     "node-contains": "Returns true if other is an inclusive descendant of node, and false otherwise.",
-    "document-document": "Returns a new document.",
+    "document-constructor": "Returns a new document.",
     "document-implementation": "Returns document's DOMImplementation object.",
     "document-url": "Returns document's URL.",
     "document-documenturi": "Returns document's URL.",
@@ -98,7 +98,7 @@
     "document-createprocessinginstruction": "Returns a ProcessingInstruction node whose target is target and data is data. If target does not match the Name production an \"InvalidCharacterError\" DOMException will be thrown. If data contains \"?>\" an \"InvalidCharacterError\" DOMException will be thrown.",
     "document-importnode": "Returns a copy of node. If deep is true, the copy also includes the node's descendants.\n\nIf node is a document or a shadow root, throws a \"NotSupportedError\" DOMException.",
     "document-adoptnode": "Moves node from another document and returns it.\n\nIf node is a document, throws a \"NotSupportedError\" DOMException or, if node is a shadow root, throws a \"HierarchyRequestError\" DOMException.",
-    "documentfragment-documentfragment": "Returns a new DocumentFragment node.",
+    "documentfragment-constructor": "Returns a new DocumentFragment node.",
     "element-namespaceuri": "Returns the namespace.",
     "element-prefix": "Returns the namespace prefix.",
     "element-localname": "Returns the local name.",
@@ -122,17 +122,17 @@
     "element-shadowroot": "Returns element's shadow root, if any, and if shadow root's mode is \"open\", and null otherwise.",
     "element-closest": "Returns the first (starting at element) inclusive ancestor that matches selectors, and null otherwise.",
     "element-matches": "Returns true if matching selectors against element's root yields element, and false otherwise.",
-    "text-text": "Returns a new Text node whose data is data.",
+    "text-constructor": "Returns a new Text node whose data is data.",
     "text-splittext": "Splits data at the given offset and returns the remainder as Text node.",
     "text-wholetext": "Returns the combined data of all direct Text node siblings.",
-    "comment-comment": "Returns a new Comment node whose data is data.",
+    "comment-constructor": "Returns a new Comment node whose data is data.",
     "abstractrange-startcontainer": "Returns range's start node.",
     "abstractrange-startoffset": "Returns range's start offset.",
     "abstractrange-endcontainer": "Returns range's end node.",
     "abstractrange-endoffset": "Returns range's end offset.",
     "abstractrange-collapsed": "Returns true if range is collapsed, and false otherwise.",
-    "staticrange-staticrange": "Returns a new range object that does not update when the node tree mutates.",
-    "range-range": "Returns a new live range.",
+    "staticrange-constructor": "Returns a new range object that does not update when the node tree mutates.",
+    "range-constructor": "Returns a new live range.",
     "range-commonancestorcontainer": "Returns the node, furthest away from the document, that is an ancestor of both range's start node and end node.",
     "range-comparepoint": "Returns −1 if the point is before the range, 0 if the point is in the range, and 1 if the point is after the range.",
     "range-intersectsnode": "Returns whether range intersects node.",
diff --git a/inputfiles/idl/Encoding.commentmap.json b/inputfiles/idl/Encoding.commentmap.json
index 39a14c10b..030bbf382 100644
--- a/inputfiles/idl/Encoding.commentmap.json
+++ b/inputfiles/idl/Encoding.commentmap.json
@@ -1,13 +1,13 @@
 {
     "textdecoder": "Returns a new TextDecoder object.\n\nIf label is either not a label or is a label for replacement, throws a RangeError.",
     "textdecodercommon-encoding": "Returns encoding's name, lowercased.",
-    "textdecodercommon-fatal": "Returns true if error mode is \"fatal\", and false otherwise.",
-    "textdecodercommon-ignorebom": "Returns true if ignore BOM flag is set, and false otherwise.",
-    "textdecoder-decode": "Returns the result of running encoding's decoder. The method can be invoked zero or more times with options's stream set to true, and then once without options's stream (or set to false), to process a fragmented stream. If the invocation without options's stream (or set to false) has no input, it's clearest to omit both arguments.\n\n```\nvar string = \"\", decoder = new TextDecoder(encoding), buffer;\nwhile(buffer = next_chunk()) {\n  string += decoder.decode(buffer, {stream:true});\n}\nstring += decoder.decode(); // end-of-stream\n```\n\nIf the error mode is \"fatal\" and encoding's decoder returns error, throws a TypeError.",
+    "textdecodercommon-fatal": "Returns true if error mode is \"fatal\", otherwise false.",
+    "textdecodercommon-ignorebom": "Returns the value of ignore BOM.",
+    "textdecoder-decode": "Returns the result of running encoding's decoder. The method can be invoked zero or more times with options's stream set to true, and then once without options's stream (or set to false), to process a fragmented input. If the invocation without options's stream (or set to false) has no input, it's clearest to omit both arguments.\n\n```\nvar string = \"\", decoder = new TextDecoder(encoding), buffer;\nwhile(buffer = next_chunk()) {\n  string += decoder.decode(buffer, {stream:true});\n}\nstring += decoder.decode(); // end-of-queue\n```\n\nIf the error mode is \"fatal\" and encoding's decoder returns error, throws a TypeError.",
     "textencoder": "Returns a new TextEncoder object.",
     "textencodercommon-encoding": "Returns \"utf-8\".",
     "textencoder-encode": "Returns the result of running UTF-8's encoder.",
-    "textencoder-encodeinto": "Runs the UTF-8 encoder on source, stores the result of that operation into destination, and returns the progress made as a dictionary whereby read is the number of converted code units of source and written is the number of bytes modified in destination.",
+    "textencoder-encodeinto": "Runs the UTF-8 encoder on source, stores the result of that operation into destination, and returns the progress made as an object wherein read is the number of converted code units of source and written is the number of bytes modified in destination.",
     "textdecoderstream": "Returns a new TextDecoderStream object.\n\nIf label is either not a label or is a label for replacement, throws a RangeError.",
     "generictransformstream-readable": "Returns a readable stream whose chunks are strings resulting from running encoding's decoder on the chunks written to writable.",
     "generictransformstream-writable": "Returns a writable stream which accepts [AllowShared] BufferSource chunks and runs them through encoding's decoder before making them available to readable.\n\nTypically this will be used via the pipeThrough() method on a ReadableStream source.\n\n```\nvar decoder = new TextDecoderStream(encoding);\nbyteReadable\n  .pipeThrough(decoder)\n  .pipeTo(textWritable);\n```\n\nIf the error mode is \"fatal\" and encoding's decoder returns error, both readable and writable will be errored with a TypeError.",
diff --git a/inputfiles/idl/HTML - Canvas.commentmap.json b/inputfiles/idl/HTML - Canvas.commentmap.json
index c41746a79..8f958ecf7 100644
--- a/inputfiles/idl/HTML - Canvas.commentmap.json	
+++ b/inputfiles/idl/HTML - Canvas.commentmap.json	
@@ -3,11 +3,52 @@
     "canvas-todataurl": "Returns a data: URL for the image in the canvas.\n\nThe first argument, if provided, controls the type of the image to be returned (e.g. PNG or JPEG). The default is \"image/png\"; that type is also used if the given type isn't supported. The second argument applies if the type is an image format that supports variable quality (such as \"image/jpeg\"), and is a number in the range 0.0 to 1.0 inclusive indicating the desired quality level for the resulting image.\n\nWhen trying to use types other than \"image/png\", authors can check if the image was really returned in the requested format by checking to see if the returned string starts with one of the exact strings \"data:image/png,\" or \"data:image/png;\". If it does, the image is PNG, and thus the requested type was not supported. (The one exception to this is if the canvas has either no height or no width, in which case the result might simply be \"data:,\".)",
     "canvas-toblob": "Creates a Blob object representing a file containing the image in the canvas, and invokes a callback with a handle to that object.\n\nThe second argument, if provided, controls the type of the image to be returned (e.g. PNG or JPEG). The default is \"image/png\"; that type is also used if the given type isn't supported. The third argument applies if the type is an image format that supports variable quality (such as \"image/jpeg\"), and is a number in the range 0.0 to 1.0 inclusive indicating the desired quality level for the resulting image.",
     "canvas-transfercontroltooffscreen": "Returns a newly created OffscreenCanvas object that uses the canvas element as a placeholder. Once the canvas element has become a placeholder for an OffscreenCanvas object, its intrinsic size can no longer be changed, and it cannot have a rendering context. The content of the placeholder canvas is updated by calling the commit() method of the OffscreenCanvas object's rendering context.",
-    "context-2d": "Returns the canvas element.",
+    "canvasrenderingcontext2d-canvas": "Returns the canvas element.",
+    "context-getcontextattributes": "Returns an object whose:\n\nalpha member is true if the context has an alpha channel, or false if it was forced to be opaque.\ndesynchronized member is true if the context can be desynchronized.",
+    "canvasstate-save": "Pushes the current state onto the stack.",
+    "canvasstate-restore": "Pops the top state on the stack, restoring the context to that state.",
+    "context-linewidth": "Returns the current line width.\n\nCan be set, to change the line width. Values that are not finite values greater than zero are ignored.",
+    "context-linecap": "Returns the current line cap style.\n\nCan be set, to change the line cap style.\n\nThe possible line cap styles are \"butt\", \"round\", and \"square\". Other values are ignored.",
+    "context-linejoin": "Returns the current line join style.\n\nCan be set, to change the line join style.\n\nThe possible line join styles are \"bevel\", \"round\", and \"miter\". Other values are ignored.",
+    "context-miterlimit": "Returns the current miter limit ratio.\n\nCan be set, to change the miter limit ratio. Values that are not finite values greater than zero are ignored.",
+    "context-setlinedash": "Sets the current line dash pattern (as used when stroking). The argument is a list of distances for which to alternately have the line on and the line off.",
+    "context-getlinedash": "Returns a copy of the current line dash pattern. The array returned will always have an even number of entries (i.e. the pattern is normalized).",
+    "context-linedashoffset": "Returns the phase offset (in the same units as the line dash pattern).\n\nCan be set, to change the phase offset. Values that are not finite values are ignored.",
+    "canvastextdrawingstyles-font": "Returns the current font settings.\n\nCan be set, to change the font. The syntax is the same as for the CSS 'font' property; values that cannot be parsed as CSS font values are ignored.\n\nRelative keywords and lengths are computed relative to the font of the canvas element.",
+    "context-textalign": "Returns the current text alignment settings.\n\nCan be set, to change the alignment. The possible values are and their meanings are given below. Other values are ignored. The default is \"start\".",
+    "context-textbaseline": "Returns the current baseline alignment settings.\n\nCan be set, to change the baseline alignment. The possible values and their meanings are given below. Other values are ignored. The default is \"alphabetic\".",
+    "canvastextdrawingstyles-direction": "Returns the current directionality.\n\nCan be set, to change the directionality. The possible values and their meanings are given below. Other values are ignored. The default is \"inherit\".",
+    "context-moveto": "Creates a new subpath with the given point.",
+    "context-closepath": "Marks the current subpath as closed, and starts a new subpath with a point the same as the start and end of the newly closed subpath.",
+    "context-lineto": "Adds the given point to the current subpath, connected to the previous one by a straight line.",
+    "context-quadraticcurveto": "Adds the given point to the current subpath, connected to the previous one by a quadratic Bézier curve with the given control point.",
+    "context-beziercurveto": "Adds the given point to the current subpath, connected to the previous one by a cubic Bézier curve with the given control points.",
+    "context-arcto": "Adds an arc with the given control points and radius to the current subpath, connected to the previous point by a straight line.\n\nThrows an \"IndexSizeError\" DOMException if the given radius is negative.",
+    "canvaspath-arc": "Adds points to the subpath such that the arc described by the circumference of the circle described by the arguments, starting at the given start angle and ending at the given end angle, going in the given direction (defaulting to clockwise), is added to the path, connected to the previous point by a straight line.\n\nThrows an \"IndexSizeError\" DOMException if the given radius is negative.",
+    "canvaspath-ellipse": "Adds points to the subpath such that the arc described by the circumference of the ellipse described by the arguments, starting at the given start angle and ending at the given end angle, going in the given direction (defaulting to clockwise), is added to the path, connected to the previous point by a straight line.\n\nThrows an \"IndexSizeError\" DOMException if the given radius is negative.",
+    "canvaspath-rect": "Adds a new closed subpath to the path, representing the given rectangle.",
     "path2d": "Creates a new empty Path2D object.",
     "path2d-addpath": "Adds to the path the path given by the argument.",
+    "canvastransform-scale": "Changes the current transformation matrix to apply a scaling transformation with the given characteristics.",
+    "canvastransform-rotate": "Changes the current transformation matrix to apply a rotation transformation with the given characteristics. The angle is in radians.",
+    "canvastransform-translate": "Changes the current transformation matrix to apply a translation transformation with the given characteristics.",
+    "canvastransform-transform": "Changes the current transformation matrix to apply the matrix given by the arguments as described below.",
+    "context-gettransform": "Returns a copy of the current transformation matrix, as a newly created DOMMatrix object.",
+    "context-settransform": "Changes the current transformation matrix to the matrix given by the arguments as described below.",
+    "context-resettransform": "Changes the current transformation matrix to the identity matrix.",
+    "context-fillstyle": "Returns the current style used for filling shapes.\n\nCan be set, to change the fill style.\n\nThe style can be either a string containing a CSS color, or a CanvasGradient or CanvasPattern object. Invalid values are ignored.",
+    "context-strokestyle": "Returns the current style used for stroking shapes.\n\nCan be set, to change the stroke style.\n\nThe style can be either a string containing a CSS color, or a CanvasGradient or CanvasPattern object. Invalid values are ignored.",
     "canvasgradient-addcolorstop": "Adds a color stop with the given color to the gradient at the given offset. 0.0 is the offset at one end of the gradient, 1.0 is the offset at the other end.\n\nThrows an \"IndexSizeError\" DOMException if the offset is out of range. Throws a \"SyntaxError\" DOMException if the color cannot be parsed.",
+    "context-createlineargradient": "Returns a CanvasGradient object that represents a linear gradient that paints along the line given by the coordinates represented by the arguments.",
+    "context-createradialgradient": "Returns a CanvasGradient object that represents a radial gradient that paints along the cone given by the circles represented by the arguments.\n\nIf either of the radii are negative, throws an \"IndexSizeError\" DOMException exception.",
+    "context-createpattern": "Returns a CanvasPattern object that uses the given image and repeats in the direction(s) given by the repetition argument.\n\nThe allowed values for repetition are repeat (both directions), repeat-x (horizontal only), repeat-y (vertical only), and no-repeat (neither). If the repetition argument is empty, the value repeat is used.\n\nIf the image isn't yet fully decoded, then nothing is drawn. If the image is a canvas with no data, throws an \"InvalidStateError\" DOMException.",
     "canvaspattern-settransform": "Sets the transformation matrix that will be used when rendering the pattern during a fill or stroke painting operation.",
+    "context-clearrect": "Clears all pixels on the bitmap in the given rectangle to transparent black.",
+    "context-fillrect": "Paints the given rectangle onto the bitmap, using the current fill style.",
+    "context-strokerect": "Paints the box that outlines the given rectangle onto the bitmap, using the current stroke style.",
+    "context-filltext": "Fills or strokes (respectively) the given text at the given position. If a maximum width is provided, the text will be scaled to fit that width if necessary.",
+    "context-stroketext": "Fills or strokes (respectively) the given text at the given position. If a maximum width is provided, the text will be scaled to fit that width if necessary.",
+    "context-measuretext": "Returns a TextMetrics object with the metrics of the given text in the current font.",
     "textmetrics-width": "Returns the measurement described below.",
     "textmetrics-actualboundingboxleft": "Returns the measurement described below.",
     "textmetrics-actualboundingboxright": "Returns the measurement described below.",
@@ -20,10 +61,31 @@
     "textmetrics-hangingbaseline": "Returns the measurement described below.",
     "textmetrics-alphabeticbaseline": "Returns the measurement described below.",
     "textmetrics-ideographicbaseline": "Returns the measurement described below.",
+    "context-beginpath": "Resets the current default path.",
+    "canvasdrawpath-fill": "Fills the subpaths of the current default path or the given path with the current fill style, obeying the given fill rule.",
+    "canvasdrawpath-stroke": "Strokes the subpaths of the current default path or the given path with the current stroke style.",
+    "canvasdrawpath-clip": "Further constrains the clipping region to the current default path or the given path, using the given fill rule to determine what points are in the path.",
+    "context-ispointinpath": "Returns true if the given point is in the current default path or the given path, using the given fill rule to determine what points are in the path.",
+    "context-ispointinstroke": "Returns true if the given point would be in the region covered by the stroke of the current default path or the given path, given the current stroke style.",
+    "context-drawfocusifneeded": "If the given element is focused, draws a focus ring around the current default path or the given path, following the platform conventions for focus rings.",
+    "context-scrollpathintoview": "Scrolls the current default path or the given path into view. This is especially useful on devices with small screens, where the whole canvas might not be visible at once.",
+    "context-drawimage": "Draws the given image onto the canvas. The arguments are interpreted as follows:\n\nIf the image isn't yet fully decoded, then nothing is drawn. If the image is a canvas with no data, throws an \"InvalidStateError\" DOMException.",
     "imagedata": "Returns an ImageData object with the given dimensions. All the pixels in the returned object are transparent black.\n\nThrows an \"IndexSizeError\" DOMException if either of the width or height arguments are zero.",
+    "context-createimagedata": "Returns an ImageData object with the given dimensions. All the pixels in the returned object are transparent black.\n\nThrows an \"IndexSizeError\" DOMException if either of the width or height arguments are zero.",
+    "context-getimagedata": "Returns an ImageData object containing the image data for the given rectangle of the bitmap.\n\nThrows an \"IndexSizeError\" DOMException if the either of the width or height arguments are zero.",
     "imagedata-width": "Returns the actual dimensions of the data in the ImageData object, in pixels.",
     "imagedata-height": "Returns the actual dimensions of the data in the ImageData object, in pixels.",
     "imagedata-data": "Returns the one-dimensional array containing the data in RGBA order, as integers in the range 0 to 255.",
+    "context-putimagedata": "Paints the data from the given ImageData object onto the bitmap. If a dirty rectangle is provided, only the pixels from that rectangle are painted.\n\nThe globalAlpha and globalCompositeOperation attributes, as well as the shadow attributes, are ignored for the purposes of this method call; pixels in the canvas are replaced wholesale, with no composition, alpha blending, no shadows, etc.\n\nThrows an \"InvalidStateError\" DOMException if the imagedata object's data attribute value's [[ViewedArrayBuffer]] internal slot is detached.",
+    "context-globalalpha": "Returns the current alpha value applied to rendering operations.\n\nCan be set, to change the alpha value. Values outside of the range 0.0 .. 1.0 are ignored.",
+    "context-globalcompositeoperation": "Returns the current composition operation, from the values defined in Compositing and Blending. [COMPOSITE].\n\nCan be set, to change the composition operation. Unknown values are ignored.",
+    "context-imagesmoothingenabled": "Returns whether pattern fills and the drawImage() method will attempt to smooth images if their pixels don't line up exactly with the display, when scaling images up.\n\nCan be set, to change whether images are smoothed (true) or not (false).",
+    "context-imagesmoothingquality": "Returns the current image-smoothing-quality preference.\n\nCan be set, to change the preferred quality of image smoothing. The possible values are \"low\", \"medium\" and \"high\". Unknown values are ignored.",
+    "context-shadowcolor": "Returns the current shadow color.\n\nCan be set, to change the shadow color. Values that cannot be parsed as CSS colors are ignored.",
+    "context-shadowoffsetx": "Returns the current shadow offset.\n\nCan be set, to change the shadow offset. Values that are not finite numbers are ignored.",
+    "context-shadowoffsety": "Returns the current shadow offset.\n\nCan be set, to change the shadow offset. Values that are not finite numbers are ignored.",
+    "context-shadowblur": "Returns the current level of blur applied to shadows.\n\nCan be set, to change the blur level. Values that are not finite numbers greater than or equal to zero are ignored.",
+    "canvasfilters-filter": "Returns the current filter.\n\nCan be set, to change the filter. Values that cannot be parsed as a <filter-function-list> value are ignored.",
     "imagebitmaprenderingcontext-canvas": "Returns the canvas element that the context is bound to.",
     "imagebitmaprenderingcontext-transferfromimagebitmap": "Transfers the underlying bitmap data from imageBitmap to context, and the bitmap becomes the contents of the canvas element to which context is bound.",
     "offscreencanvas": "Returns a new OffscreenCanvas object that is not linked to a placeholder canvas element, and whose bitmap's size is determined by the width and height arguments.",
diff --git a/inputfiles/idl/HTML - Custom elements.commentmap.json b/inputfiles/idl/HTML - Custom elements.commentmap.json
index db61dd7f0..f7d880054 100644
--- a/inputfiles/idl/HTML - Custom elements.commentmap.json	
+++ b/inputfiles/idl/HTML - Custom elements.commentmap.json	
@@ -9,5 +9,6 @@
     "elementinternals-validationmessage": "Returns the error message that would be shown to the user if internals's target element was to be checked for validity.",
     "elementinternals-checkvalidity": "Returns true if internals's target element has no validity problems; false otherwise. Fires an invalid event at the element in the latter case.",
     "elementinternals-reportvalidity": "Returns true if internals's target element has no validity problems; otherwise, returns false, fires an invalid event at the element, and (if the event isn't canceled) reports the problem to the user.",
-    "elementinternals-labels": "Returns a NodeList of all the label elements that internals's target element is associated with."
+    "elementinternals-labels": "Returns a NodeList of all the label elements that internals's target element is associated with.",
+    "elementinternals-accessibility-idl-get": "Sets or retrieves the default ARIA role for internals's target element, which will be used unless the page author overrides it using the role attribute."
 }
diff --git a/inputfiles/idl/HTML - DOM.commentmap.json b/inputfiles/idl/HTML - DOM.commentmap.json
index 83410d6ec..b2ef7c0cb 100644
--- a/inputfiles/idl/HTML - DOM.commentmap.json	
+++ b/inputfiles/idl/HTML - DOM.commentmap.json	
@@ -14,7 +14,7 @@
     "document-getelementsbyname": "Returns a NodeList of elements in the Document that have a name attribute with the value name.",
     "document-currentscript": "Returns the script element, or the SVG script element, that is currently executing, as long as the element represents a classic script. In the case of reentrant script execution, returns the one that most recently started executing amongst those that have not yet finished executing.\n\nReturns null if the Document is not currently executing a script or SVG script element (e.g., because the running script is an event handler, or a timeout), or if the currently executing script or SVG script element represents a module script.",
     "dir": "Returns the html element's dir attribute's value, if any.\n\nCan be set, to either \"ltr\", \"rtl\", or \"auto\" to replace the html element's dir attribute's value.\n\nIf there is no html element, returns the empty string and ignores new values.",
-    "style": "Returns a CSSStyleDeclaration object for the element's style attribute.",
+    "elementcssinlinestyle-style": "Returns a CSSStyleDeclaration object for the element's style attribute.",
     "dataset": "Returns a DOMStringMap object for the element's data-* attributes.\n\nHyphenated names become camel-cased. For example, data-foo-bar=\"\" becomes element.dataset.fooBar.",
     "innertext": "Returns the element's text content \"as rendered\".\n\nCan be set, to replace the element's children with the given value, but with line breaks converted to br elements."
 }
diff --git a/inputfiles/idl/HTML - Form control infrastructure.commentmap.json b/inputfiles/idl/HTML - Form control infrastructure.commentmap.json
index 570c19394..1be03b1aa 100644
--- a/inputfiles/idl/HTML - Form control infrastructure.commentmap.json	
+++ b/inputfiles/idl/HTML - Form control infrastructure.commentmap.json	
@@ -1,9 +1,9 @@
 {
-    "fae-form": "Returns the element's form owner.\n\nReturns null if there isn't one.",
+    "htmlobjectelement,htmlinputelement,htmlbuttonelement,htmlselectelement,htmltextareaelement,htmloutputelement-form": "Returns the element's form owner.\n\nReturns null if there isn't one.",
     "textarea": "Selects everything in the text control.",
     "cva-willvalidate": "Returns true if the element will be validated when the form is submitted; false otherwise.",
     "cva-setcustomvalidity": "Sets a custom error, so that the element would fail to validate. The given message is the message to be shown to the user when reporting the problem to the user.\n\nIf the argument is the empty string, clears the custom error.",
-    "cva-validity": "Returns true if the element has no value but is a required field; false otherwise.",
+    "htmlobjectelement,htmlinputelement,htmlbuttonelement,htmlselectelement,htmltextareaelement-validity": "Returns true if the element has no value but is a required field; false otherwise.",
     "cva-checkvalidity": "Returns true if the element's value has no validity problems; false otherwise. Fires an invalid event at the element in the latter case.",
     "cva-reportvalidity": "Returns true if the element's value has no validity problems; otherwise, returns false, fires an invalid event at the element, and (if the event isn't canceled) reports the problem to the user.",
     "cva-validationmessage": "Returns the error message that would be shown to the user if the element was to be checked for validity.",
diff --git a/inputfiles/idl/HTML - Form elements.commentmap.json b/inputfiles/idl/HTML - Form elements.commentmap.json
index 0fb3e4083..596b3263a 100644
--- a/inputfiles/idl/HTML - Form elements.commentmap.json	
+++ b/inputfiles/idl/HTML - Form elements.commentmap.json	
@@ -1,26 +1,26 @@
 {
-    "select-type": "Returns \"select-multiple\" if the element has a multiple attribute, and \"select-one\" otherwise.",
-    "select-options": "Returns an HTMLOptionsCollection of the list of options.",
-    "select-length": "Returns the number of elements in the list of options.\n\nWhen set to a smaller number, truncates the number of option elements in the select.\n\nWhen set to a greater number, adds new blank option elements to the select.",
-    "select-item": "Returns the item with index index from the list of options. The items are sorted in tree order.",
+    "htmlselectelement-type": "Returns \"select-multiple\" if the element has a multiple attribute, and \"select-one\" otherwise.",
+    "htmlselectelement-options": "Returns an HTMLOptionsCollection of the list of options.",
+    "htmlselectelement-length": "Returns the number of elements in the list of options.\n\nWhen set to a smaller number, truncates the number of option elements in the select.\n\nWhen set to a greater number, adds new blank option elements to the select.",
+    "htmlselectelement-item": "Returns the item with index index from the list of options. The items are sorted in tree order.",
     "select-nameditem": "Returns the first item with ID or name name from the list of options.\n\nReturns null if no element with that ID could be found.",
-    "select-add": "Inserts element before the node given by before.\n\nThe before argument can be a number, in which case element is inserted before the item with that number, or an element from the list of options, in which case element is inserted before that element.\n\nIf before is omitted, null, or a number out of range, then element will be added at the end of the list.\n\nThis method will throw a \"HierarchyRequestError\" DOMException if element is an ancestor of the element into which it is to be inserted.",
+    "htmlselectelement-add": "Inserts element before the node given by before.\n\nThe before argument can be a number, in which case element is inserted before the item with that number, or an element from the list of options, in which case element is inserted before that element.\n\nIf before is omitted, null, or a number out of range, then element will be added at the end of the list.\n\nThis method will throw a \"HierarchyRequestError\" DOMException if element is an ancestor of the element into which it is to be inserted.",
     "select-selectedoptions": "Returns an HTMLCollection of the list of options that are selected.",
     "select-selectedindex": "Returns the index of the first selected item, if any, or −1 if there is no selected item.\n\nCan be set, to change the selection.",
-    "select-value": "Returns the value of the first selected item, if any, or the empty string if there is no selected item.\n\nCan be set, to change the selection.",
-    "datalist-options": "Returns an HTMLCollection of the option elements of the datalist element.",
-    "option-selected": "Returns true if the element is selected, and false otherwise.\n\nCan be set, to override the current state of the element.",
-    "option-index": "Returns the index of the element in its select element's options list.",
-    "option-form": "Returns the element's form element, if any, or null otherwise.",
-    "option-text": "Same as textContent, except that spaces are collapsed and script elements are skipped.",
+    "htmlselectelement-value": "Returns the value of the first selected item, if any, or the empty string if there is no selected item.\n\nCan be set, to change the selection.",
+    "htmldatalistelement-options": "Returns an HTMLCollection of the option elements of the datalist element.",
+    "htmloptionelement-selected": "Returns true if the element is selected, and false otherwise.\n\nCan be set, to override the current state of the element.",
+    "htmloptionelement-index": "Returns the index of the element in its select element's options list.",
+    "htmloptionelement-form": "Returns the element's form element, if any, or null otherwise.",
+    "htmloptionelement-text": "Same as textContent, except that spaces are collapsed and script elements are skipped.",
     "option": "Returns a new option element.\n\nThe text argument sets the contents of the element.\n\nThe value argument sets the value attribute.\n\nThe defaultSelected argument sets the selected attribute.\n\nThe selected argument sets whether or not the element is selected. If it is omitted, even if the defaultSelected argument is true, the element is not selected.",
-    "textarea-type": "Returns the string \"textarea\".",
-    "textarea-value": "Returns the current value of the element.\n\nCan be set, to change the value.",
-    "output-value": "Returns the element's current value.\n\nCan be set, to change the value.",
+    "htmltextareaelement-type": "Returns the string \"textarea\".",
+    "htmltextareaelement-value": "Returns the current value of the element.\n\nCan be set, to change the value.",
+    "htmloutputelement-value": "Returns the element's current value.\n\nCan be set, to change the value.",
     "output-defaultvalue": "Returns the element's current default value.\n\nCan be set, to change the default value.",
-    "output-type": "Returns the string \"output\".",
+    "htmloutputelement-type": "Returns the string \"output\".",
     "progress-position": "For a determinate progress bar (one with known current and maximum values), returns the result of dividing the current value by the maximum value.\n\nFor an indeterminate progress bar, returns −1.",
-    "fieldset-type": "Returns the string \"fieldset\".",
-    "fieldset-elements": "Returns an HTMLCollection of the form controls in the element.",
-    "legend-form": "Returns the element's form element, if any, or null otherwise."
+    "htmlfieldsetelement-type": "Returns the string \"fieldset\".",
+    "htmlfieldsetelement-elements": "Returns an HTMLCollection of the form controls in the element.",
+    "htmllegendelement-form": "Returns the element's form element, if any, or null otherwise."
 }
diff --git a/inputfiles/idl/HTML - Forms.commentmap.json b/inputfiles/idl/HTML - Forms.commentmap.json
index e83a14c79..6138730d8 100644
--- a/inputfiles/idl/HTML - Forms.commentmap.json	
+++ b/inputfiles/idl/HTML - Forms.commentmap.json	
@@ -1,12 +1,12 @@
 {
-    "form-elements": "Returns an HTMLFormControlsCollection of the form controls in the form (excluding image buttons for historical reasons).",
-    "form-length": "Returns the number of form controls in the form (excluding image buttons for historical reasons).",
-    "form-submit": "Submits the form, bypassing interactive constraint validation and without firing a submit event.",
+    "htmlformelement-elements": "Returns an HTMLFormControlsCollection of the form controls in the form (excluding image buttons for historical reasons).",
+    "htmlformelement-length": "Returns the number of form controls in the form (excluding image buttons for historical reasons).",
+    "htmlformelement-submit": "Submits the form, bypassing interactive constraint validation and without firing a submit event.",
     "form-requestsubmit": "Requests to submit the form. Unlike submit(), this method includes interactive constraint validation and firing a submit event, either of which can cancel submission.\n\nThe submitter argument can be used to point to a specific submit button, whose formaction, formenctype, formmethod, formnovalidate, and formtarget attributes can impact submission. Additionally, the submitter will be included when constructing the entry list for submission; normally, buttons are excluded.",
-    "form-reset": "Resets the form.",
+    "htmlformelement-reset": "Resets the form.",
     "form-checkvalidity": "Returns true if the form's controls are all valid; otherwise, returns false.",
     "form-reportvalidity": "Returns true if the form's controls are all valid; otherwise, returns false and informs the user.",
-    "label-control": "Returns the form control that is associated with this element.",
-    "label-form": "Returns the form owner of the form control that is associated with this element.\n\nReturns null if there isn't one.",
+    "htmllabelelement-control": "Returns the form control that is associated with this element.",
+    "htmllabelelement-form": "Returns the form owner of the form control that is associated with this element.\n\nReturns null if there isn't one.",
     "lfe-labels": "Returns a NodeList of all the label elements that the form control is associated with."
 }
diff --git a/inputfiles/idl/HTML - Image maps.commentmap.json b/inputfiles/idl/HTML - Image maps.commentmap.json
index 507a98cbe..e8277dee4 100644
--- a/inputfiles/idl/HTML - Image maps.commentmap.json	
+++ b/inputfiles/idl/HTML - Image maps.commentmap.json	
@@ -1,3 +1,3 @@
 {
-    "map-areas": "Returns an HTMLCollection of the area elements in the map."
+    "htmlmapelement-areas": "Returns an HTMLCollection of the area elements in the map."
 }
diff --git a/inputfiles/idl/HTML - Interactive elements.commentmap.json b/inputfiles/idl/HTML - Interactive elements.commentmap.json
index 0956c09a8..757e5cda2 100644
--- a/inputfiles/idl/HTML - Interactive elements.commentmap.json	
+++ b/inputfiles/idl/HTML - Interactive elements.commentmap.json	
@@ -1,6 +1,6 @@
 {
-    "dialog-show": "Displays the dialog element.",
+    "htmldialogelement-show": "Displays the dialog element.",
     "dialog-showmodal": "Displays the dialog element and makes it the top-most modal dialog.\n\nThis method honors the autofocus attribute.",
-    "dialog-close": "Closes the dialog element.\n\nThe argument, if provided, provides a return value.",
+    "htmldialogelement-close": "Closes the dialog element.\n\nThe argument, if provided, provides a return value.",
     "dialog-returnvalue": "Returns the dialog's return value.\n\nCan be set, to update the return value."
 }
diff --git a/inputfiles/idl/HTML - Links.commentmap.json b/inputfiles/idl/HTML - Links.commentmap.json
index 30932804f..65519922b 100644
--- a/inputfiles/idl/HTML - Links.commentmap.json	
+++ b/inputfiles/idl/HTML - Links.commentmap.json	
@@ -1,13 +1,13 @@
 {
-    "hyperlink-href": "Returns the hyperlink's URL.\n\nCan be set, to change the URL.",
-    "hyperlink-origin": "Returns the hyperlink's URL's origin.",
-    "hyperlink-protocol": "Returns the hyperlink's URL's scheme.\n\nCan be set, to change the URL's scheme.",
-    "hyperlink-username": "Returns the hyperlink's URL's username.\n\nCan be set, to change the URL's username.",
-    "hyperlink-password": "Returns the hyperlink's URL's password.\n\nCan be set, to change the URL's password.",
-    "hyperlink-host": "Returns the hyperlink's URL's host and port (if different from the default port for the scheme).\n\nCan be set, to change the URL's host and port.",
-    "hyperlink-hostname": "Returns the hyperlink's URL's host.\n\nCan be set, to change the URL's host.",
-    "hyperlink-port": "Returns the hyperlink's URL's port.\n\nCan be set, to change the URL's port.",
-    "hyperlink-pathname": "Returns the hyperlink's URL's path.\n\nCan be set, to change the URL's path.",
-    "hyperlink-search": "Returns the hyperlink's URL's query (includes leading \"?\" if non-empty).\n\nCan be set, to change the URL's query (ignores leading \"?\").",
-    "hyperlink-hash": "Returns the hyperlink's URL's fragment (includes leading \"#\" if non-empty).\n\nCan be set, to change the URL's fragment (ignores leading \"#\")."
+    "htmlhyperlinkelementutils-href": "Returns the hyperlink's URL.\n\nCan be set, to change the URL.",
+    "htmlhyperlinkelementutils-origin": "Returns the hyperlink's URL's origin.",
+    "htmlhyperlinkelementutils-protocol": "Returns the hyperlink's URL's scheme.\n\nCan be set, to change the URL's scheme.",
+    "htmlhyperlinkelementutils-username": "Returns the hyperlink's URL's username.\n\nCan be set, to change the URL's username.",
+    "htmlhyperlinkelementutils-password": "Returns the hyperlink's URL's password.\n\nCan be set, to change the URL's password.",
+    "htmlhyperlinkelementutils-host": "Returns the hyperlink's URL's host and port (if different from the default port for the scheme).\n\nCan be set, to change the URL's host and port.",
+    "htmlhyperlinkelementutils-hostname": "Returns the hyperlink's URL's host.\n\nCan be set, to change the URL's host.",
+    "htmlhyperlinkelementutils-port": "Returns the hyperlink's URL's port.\n\nCan be set, to change the URL's port.",
+    "htmlhyperlinkelementutils-pathname": "Returns the hyperlink's URL's path.\n\nCan be set, to change the URL's path.",
+    "htmlhyperlinkelementutils-search": "Returns the hyperlink's URL's query (includes leading \"?\" if non-empty).\n\nCan be set, to change the URL's query (ignores leading \"?\").",
+    "htmlhyperlinkelementutils-hash": "Returns the hyperlink's URL's fragment (includes leading \"#\" if non-empty).\n\nCan be set, to change the URL's fragment (ignores leading \"#\")."
 }
diff --git a/inputfiles/idl/HTML - Media.commentmap.json b/inputfiles/idl/HTML - Media.commentmap.json
index 7058bf8d2..61323401a 100644
--- a/inputfiles/idl/HTML - Media.commentmap.json	
+++ b/inputfiles/idl/HTML - Media.commentmap.json	
@@ -3,26 +3,27 @@
     "video-videoheight": "These attributes return the intrinsic dimensions of the video, or zero if the dimensions are not known.",
     "audio": "Returns a new audio element, with the src attribute set to the value passed in the argument, if applicable.",
     "track-readystate": "Returns the text track readiness state, represented by a number from the following list:",
-    "track-track": "Returns the TextTrack object corresponding to the text track of the track element.",
-    "media-error": "Returns a MediaError object representing the current error state of the element.\n\nReturns null if there is no error.",
+    "htmltrackelement-track": "Returns the TextTrack object corresponding to the text track of the track element.",
+    "htmlmediaelement-error": "Returns a MediaError object representing the current error state of the element.\n\nReturns null if there is no error.",
     "media-srcobject": "Allows the media element to be assigned a media provider object.",
     "media-currentsrc": "Returns the URL of the current media resource, if any.\n\nReturns the empty string when there is no media resource, or it doesn't have a URL.",
     "navigator-canplaytype": "Returns the empty string (a negative response), \"maybe\", or \"probably\" based on how confident the user agent is that it can play media resources of the given type.",
     "media-networkstate": "Returns the current state of network activity for the element, from the codes in the list below.",
-    "media-load": "Causes the element to reset and start selecting and loading a new media resource from scratch.",
-    "media-buffered": "Returns a TimeRanges object that represents the ranges of the media resource that the user agent has buffered.",
-    "media-duration": "Returns the length of the media resource, in seconds, assuming that the start of the media resource is at time zero.\n\nReturns NaN if the duration isn't available.\n\nReturns Infinity for unbounded streams.",
+    "htmlmediaelement-load": "Causes the element to reset and start selecting and loading a new media resource from scratch.",
+    "htmlmediaelement-buffered": "Returns a TimeRanges object that represents the ranges of the media resource that the user agent has buffered.",
+    "htmlmediaelement-duration": "Returns the length of the media resource, in seconds, assuming that the start of the media resource is at time zero.\n\nReturns NaN if the duration isn't available.\n\nReturns Infinity for unbounded streams.",
     "media-currenttime": "Returns the official playback position, in seconds.\n\nCan be set, to seek to the given time.",
     "media-readystate": "Returns a value that expresses the current state of the element with respect to rendering the current playback position, from the codes in the list below.",
-    "media-paused": "Returns true if playback is paused; false otherwise.",
-    "media-ended": "Returns true if playback has reached the end of the media resource.",
+    "htmlmediaelement-paused": "Returns true if playback is paused; false otherwise.",
+    "htmlmediaelement-ended": "Returns true if playback has reached the end of the media resource.",
     "media-defaultplaybackrate": "Returns the default rate of playback, for when the user is not fast-forwarding or reversing through the media resource.\n\nCan be set, to change the default rate of playback.\n\nThe default rate has no direct effect on playback, but if the user switches to a fast-forward mode, when they return to the normal playback mode, it is expected that the rate of playback will be returned to the default rate of playback.",
     "media-playbackrate": "Returns the current rate playback, where 1.0 is normal speed.\n\nCan be set, to change the rate of playback.",
-    "media-played": "Returns a TimeRanges object that represents the ranges of the media resource that the user agent has played.",
-    "media-play": "Sets the paused attribute to false, loading the media resource and beginning playback if necessary. If the playback had ended, will restart it from the start.",
-    "media-pause": "Sets the paused attribute to true, loading the media resource if necessary.",
-    "media-seeking": "Returns true if the user agent is currently seeking.",
-    "media-seekable": "Returns a TimeRanges object that represents the ranges of the media resource to which it is possible for the user agent to seek.",
+    "media-preservespitch": "Returns true if pitch-preserving algorithms are used when the playbackRate is not 1.0. The default value is true.\n\nCan be set to false to have the media resource's audio pitch change up or down depending on the playbackRate. This is useful for aesthetic and performance reasons.",
+    "htmlmediaelement-played": "Returns a TimeRanges object that represents the ranges of the media resource that the user agent has played.",
+    "htmlmediaelement-play": "Sets the paused attribute to false, loading the media resource and beginning playback if necessary. If the playback had ended, will restart it from the start.",
+    "htmlmediaelement-pause": "Sets the paused attribute to true, loading the media resource if necessary.",
+    "htmlmediaelement-seeking": "Returns true if the user agent is currently seeking.",
+    "htmlmediaelement-seekable": "Returns a TimeRanges object that represents the ranges of the media resource to which it is possible for the user agent to seek.",
     "media-fastseek": "Seeks to near the given time as fast as possible, trading precision for speed. (To seek to a precise time, use the currentTime attribute.)\n\nThis does nothing if the media resource has not been loaded.",
     "media-audiotracks": "Returns an AudioTrackList object representing the audio tracks available in the media resource.",
     "media-videotracks": "Returns a VideoTrackList object representing the video tracks available in the media resource.",
@@ -55,8 +56,8 @@
     "texttrackcue-starttime": "Returns the text track cue start time, in seconds.\n\nCan be set.",
     "texttrackcue-endtime": "Returns the text track cue end time, in seconds.\n\nCan be set.",
     "texttrackcue-pauseonexit": "Returns true if the text track cue pause-on-exit flag is set, false otherwise.\n\nCan be set.",
-    "media-volume": "Returns the current playback volume, as a number in the range 0.0 to 1.0, where 0.0 is the quietest and 1.0 the loudest.\n\nCan be set, to change the volume.\n\nThrows an \"IndexSizeError\" DOMException if the new value is not in the range 0.0 .. 1.0.",
-    "media-muted": "Returns true if audio is muted, overriding the volume attribute, and false if the volume attribute is being honored.\n\nCan be set, to change whether the audio is muted or not.",
+    "htmlmediaelement-volume": "Returns the current playback volume, as a number in the range 0.0 to 1.0, where 0.0 is the quietest and 1.0 the loudest.\n\nCan be set, to change the volume.\n\nThrows an \"IndexSizeError\" DOMException if the new value is not in the range 0.0 .. 1.0.",
+    "htmlmediaelement-muted": "Returns true if audio is muted, overriding the volume attribute, and false if the volume attribute is being honored.\n\nCan be set, to change whether the audio is muted or not.",
     "timeranges-length": "Returns the number of ranges in the object.",
     "timeranges-start": "Returns the time for the start of the range with the given index.\n\nThrows an \"IndexSizeError\" DOMException if the index is out of range.",
     "timeranges-end": "Returns the time for the end of the range with the given index.\n\nThrows an \"IndexSizeError\" DOMException if the index is out of range.",
diff --git a/inputfiles/idl/HTML - Offline Web applications.commentmap.json b/inputfiles/idl/HTML - Offline Web applications.commentmap.json
index e3354e7aa..d48b0aebb 100644
--- a/inputfiles/idl/HTML - Offline Web applications.commentmap.json	
+++ b/inputfiles/idl/HTML - Offline Web applications.commentmap.json	
@@ -1,8 +1,8 @@
 {
     "applicationcache": "Returns the ApplicationCache object that applies to the active document of that Window.",
-    "appcache-status": "Returns the current status of the application cache, as given by the constants defined below.",
-    "appcache-update": "Invokes the application cache download process.\n\nThrows an \"InvalidStateError\" DOMException if there is no application cache to update.\n\nCalling this method is not usually necessary, as user agents will generally take care of updating application caches automatically.\n\nThe method can be useful in situations such as long-lived applications. For example, a Web mail application might stay open in a browser tab for weeks at a time. Such an application could want to test for updates each day.",
-    "appcache-abort": "Cancels the application cache download process.\n\nThis method is intended to be used by Web application showing their own caching progress UI, in case the user wants to stop the update (e.g. because bandwidth is limited).",
-    "appcache-swapcache": "Switches to the most recent application cache, if there is a newer one. If there isn't, throws an \"InvalidStateError\" DOMException.\n\nThis does not cause previously-loaded resources to be reloaded; for example, images do not suddenly get reloaded and style sheets and scripts do not get reparsed or reevaluated. The only change is that subsequent requests for cached resources will obtain the newer copies.\n\nThe updateready event will fire before this method can be called. Once it fires, the Web application can, at its leisure, call this method to switch the underlying cache to the one with the more recent updates. To make proper use of this, applications have to be able to bring the new features into play; for example, reloading scripts to enable new features.\n\nAn easier alternative to swapCache() is just to reload the entire page at a time suitable for the user, using location.reload().",
+    "applicationcache-status": "Returns the current status of the application cache, as given by the constants defined below.",
+    "applicationcache-update": "Invokes the application cache download process.\n\nThrows an \"InvalidStateError\" DOMException if there is no application cache to update.\n\nCalling this method is not usually necessary, as user agents will generally take care of updating application caches automatically.\n\nThe method can be useful in situations such as long-lived applications. For example, a web mail application might stay open in a browser tab for weeks at a time. Such an application could want to test for updates each day.",
+    "applicationcache-abort": "Cancels the application cache download process.\n\nThis method is intended to be used by web application showing their own caching progress UI, in case the user wants to stop the update (e.g. because bandwidth is limited).",
+    "appcache-swapcache": "Switches to the most recent application cache, if there is a newer one. If there isn't, throws an \"InvalidStateError\" DOMException.\n\nThis does not cause previously-loaded resources to be reloaded; for example, images do not suddenly get reloaded and style sheets and scripts do not get reparsed or reevaluated. The only change is that subsequent requests for cached resources will obtain the newer copies.\n\nThe updateready event will fire before this method can be called. Once it fires, the web application can, at its leisure, call this method to switch the underlying cache to the one with the more recent updates. To make proper use of this, applications have to be able to bring the new features into play; for example, reloading scripts to enable new features.\n\nAn easier alternative to swapCache() is just to reload the entire page at a time suitable for the user, using location.reload().",
     "navigator": "Returns false if the user agent is definitely offline (disconnected from the network). Returns true if the user agent might be online.\n\nThe events online and offline are fired when the value of this attribute changes."
 }
diff --git a/inputfiles/idl/HTML - Scripting.commentmap.json b/inputfiles/idl/HTML - Scripting.commentmap.json
index d5a2e1e88..3f02be43c 100644
--- a/inputfiles/idl/HTML - Scripting.commentmap.json	
+++ b/inputfiles/idl/HTML - Scripting.commentmap.json	
@@ -1,6 +1,6 @@
 {
-    "script-text": "Returns the child text content of the element.\n\nCan be set, to replace the element's children with the given value.",
-    "template-content": "Returns the template contents (a DocumentFragment).",
+    "htmlscriptelement-text": "Returns the child text content of the element.\n\nCan be set, to replace the element's children with the given value.",
+    "htmltemplateelement-content": "Returns the template contents (a DocumentFragment).",
     "slot-name": "Can be used to get and set slot's name.",
     "slot-assignednodes": "Returns slot's assigned nodes.",
     "slot-assignedelements": "Returns slot's assigned nodes, limited to elements."
diff --git a/inputfiles/idl/HTML - Semantics.commentmap.json b/inputfiles/idl/HTML - Semantics.commentmap.json
index 7d7c3b9d7..8e9b6b84c 100644
--- a/inputfiles/idl/HTML - Semantics.commentmap.json	
+++ b/inputfiles/idl/HTML - Semantics.commentmap.json	
@@ -1,3 +1,3 @@
 {
-    "title-text": "Returns the child text content of the element.\n\nCan be set, to replace the element's children with the given value."
+    "htmltitleelement-text": "Returns the child text content of the element.\n\nCan be set, to replace the element's children with the given value."
 }
diff --git a/inputfiles/idl/HTML - Tabular data.commentmap.json b/inputfiles/idl/HTML - Tabular data.commentmap.json
index c7d474dee..e94a9a797 100644
--- a/inputfiles/idl/HTML - Tabular data.commentmap.json	
+++ b/inputfiles/idl/HTML - Tabular data.commentmap.json	
@@ -1,5 +1,5 @@
 {
-    "table-caption": "Returns the table's caption element.\n\nCan be set, to replace the caption element.",
+    "htmltableelement-caption": "Returns the table's caption element.\n\nCan be set, to replace the caption element.",
     "table-createcaption": "Ensures the table has a caption element, and returns it.",
     "table-deletecaption": "Ensures the table does not have a caption element.",
     "table-thead": "Returns the table's thead element.\n\nCan be set, to replace the thead element. If the new value is not a thead element, throws a \"HierarchyRequestError\" DOMException.",
@@ -10,15 +10,15 @@
     "table-deletetfoot": "Ensures the table does not have a tfoot element.",
     "table-tbodies": "Returns an HTMLCollection of the tbody elements of the table.",
     "table-createtbody": "Creates a tbody element, inserts it into the table, and returns it.",
-    "table-rows": "Returns an HTMLCollection of the tr elements of the table.",
+    "htmltableelement-rows": "Returns an HTMLCollection of the tr elements of the table.",
     "table-insertrow": "Creates a tr element, along with a tbody if required, inserts them into the table at the position given by the argument, and returns the tr.\n\nThe position is relative to the rows in the table. The index −1, which is the default if the argument is omitted, is equivalent to inserting at the end of the table.\n\nIf the given position is less than −1 or greater than the number of rows, throws an \"IndexSizeError\" DOMException.",
     "table-deleterow": "Removes the tr element with the given position in the table.\n\nThe position is relative to the rows in the table. The index −1 is equivalent to deleting the last row of the table.\n\nIf the given position is less than −1 or greater than the index of the last row, or if there are no rows, throws an \"IndexSizeError\" DOMException.",
-    "tbody-rows": "Returns an HTMLCollection of the tr elements of the table section.",
+    "htmltablesectionelement-rows": "Returns an HTMLCollection of the tr elements of the table section.",
     "tbody-insertrow": "Creates a tr element, inserts it into the table section at the position given by the argument, and returns the tr.\n\nThe position is relative to the rows in the table section. The index −1, which is the default if the argument is omitted, is equivalent to inserting at the end of the table section.\n\nIf the given position is less than −1 or greater than the number of rows, throws an \"IndexSizeError\" DOMException.",
     "tbody-deleterow": "Removes the tr element with the given position in the table section.\n\nThe position is relative to the rows in the table section. The index −1 is equivalent to deleting the last row of the table section.\n\nIf the given position is less than −1 or greater than the index of the last row, or if there are no rows, throws an \"IndexSizeError\" DOMException.",
     "tr-rowindex": "Returns the position of the row in the table's rows list.\n\nReturns −1 if the element isn't in a table.",
     "tr-sectionrowindex": "Returns the position of the row in the table section's rows list.\n\nReturns −1 if the element isn't in a table section.",
-    "tr-cells": "Returns an HTMLCollection of the td and th elements of the row.",
+    "htmltablerowelement-cells": "Returns an HTMLCollection of the td and th elements of the row.",
     "tr-insertcell": "Creates a td element, inserts it into the table row at the position given by the argument, and returns the td.\n\nThe position is relative to the cells in the row. The index −1, which is the default if the argument is omitted, is equivalent to inserting at the end of the row.\n\nIf the given position is less than −1 or greater than the number of cells, throws an \"IndexSizeError\" DOMException.",
     "tr-deletecell": "Removes the td or th element with the given position in the row.\n\nThe position is relative to the cells in the row. The index −1 is equivalent to deleting the last cell of the row.\n\nIf the given position is less than −1 or greater than the index of the last cell, or if there are no cells, throws an \"IndexSizeError\" DOMException.",
     "tdth-cellindex": "Returns the position of the cell in the row's cells list. This does not necessarily correspond to the x-position of the cell in the table, since earlier cells might cover multiple rows or columns.\n\nReturns −1 if the element isn't in a row."
diff --git a/inputfiles/idl/HTML - Text level semantics.commentmap.json b/inputfiles/idl/HTML - Text level semantics.commentmap.json
index c62d22abd..649475893 100644
--- a/inputfiles/idl/HTML - Text level semantics.commentmap.json	
+++ b/inputfiles/idl/HTML - Text level semantics.commentmap.json	
@@ -1,3 +1,3 @@
 {
-    "a-text": "Same as textContent."
+    "htmlanchorelement-text": "Same as textContent."
 }
diff --git a/inputfiles/idl/HTML - The input element.commentmap.json b/inputfiles/idl/HTML - The input element.commentmap.json
index a4defd7d0..d3f075064 100644
--- a/inputfiles/idl/HTML - The input element.commentmap.json	
+++ b/inputfiles/idl/HTML - The input element.commentmap.json	
@@ -1,13 +1,13 @@
 {
-    "input-indeterminate": "When set, overrides the rendering of checkbox controls so that the current value is not visible.",
-    "input-width": "These attributes return the actual rendered dimensions of the image, or zero if the dimensions are not known.\n\nThey can be set, to change the corresponding content attributes.",
+    "htmlinputelement-indeterminate": "When set, overrides the rendering of checkbox controls so that the current value is not visible.",
+    "htmlinputelement-width": "These attributes return the actual rendered dimensions of the image, or zero if the dimensions are not known.\n\nThey can be set, to change the corresponding content attributes.",
     "input-height": "These attributes return the actual rendered dimensions of the image, or zero if the dimensions are not known.\n\nThey can be set, to change the corresponding content attributes.",
-    "input-value": "Returns the current value of the form control.\n\nCan be set, to change the value.\n\nThrows an \"InvalidStateError\" DOMException if it is set to any value other than the empty string when the control is a file upload control.",
-    "input-checked": "Returns the current checkedness of the form control.\n\nCan be set, to change the checkedness.",
-    "input-files": "Returns a FileList object listing the selected files of the form control.\n\nReturns null if the control isn't a file control.\n\nCan be set to a FileList object to change the selected files of the form control. For instance, as the result of a drag-and-drop operation.",
+    "htmlinputelement-value": "Returns the current value of the form control.\n\nCan be set, to change the value.\n\nThrows an \"InvalidStateError\" DOMException if it is set to any value other than the empty string when the control is a file upload control.",
+    "htmlinputelement-checked": "Returns the current checkedness of the form control.\n\nCan be set, to change the checkedness.",
+    "htmlinputelement-files": "Returns a FileList object listing the selected files of the form control.\n\nReturns null if the control isn't a file control.\n\nCan be set to a FileList object to change the selected files of the form control. For instance, as the result of a drag-and-drop operation.",
     "input-valueasdate": "Returns a Date object representing the form control's value, if applicable; otherwise, returns null.\n\nCan be set, to change the value.\n\nThrows an \"InvalidStateError\" DOMException if the control isn't date- or time-based.",
     "input-valueasnumber": "Returns a number representing the form control's value, if applicable; otherwise, returns NaN.\n\nCan be set, to change the value. Setting this to NaN will set the underlying value to the empty string.\n\nThrows an \"InvalidStateError\" DOMException if the control is neither date- or time-based nor numeric.",
     "input-stepup": "Changes the form control's value by the value given in the step attribute, multiplied by n. The default value for n is 1.\n\nThrows \"InvalidStateError\" DOMException if the control is neither date- or time-based nor numeric, or if the step attribute's value is \"any\".",
     "input-stepdown": "Changes the form control's value by the value given in the step attribute, multiplied by n. The default value for n is 1.\n\nThrows \"InvalidStateError\" DOMException if the control is neither date- or time-based nor numeric, or if the step attribute's value is \"any\".",
-    "input-list": "Returns the datalist element indicated by the list attribute."
+    "htmlinputelement-list": "Returns the datalist element indicated by the list attribute."
 }
diff --git a/inputfiles/idl/HTML - User interaction.commentmap.json b/inputfiles/idl/HTML - User interaction.commentmap.json
index 039c4977d..89ae5f6e0 100644
--- a/inputfiles/idl/HTML - User interaction.commentmap.json	
+++ b/inputfiles/idl/HTML - User interaction.commentmap.json	
@@ -1,9 +1,9 @@
 {
     "click": "Acts as if the element was clicked.",
-    "documentorshadowroot-activeelement": "Returns the deepest element in the document through which or to which key events are being routed. This is, roughly speaking, the focused element in the document.\n\nFor the purposes of this API, when a child browsing context is focused, its browsing context container is focused in the parent browsing context. For example, if the user moves the focus to a text control in an iframe, the iframe is the element returned by the activeElement API in the iframe's node document.\n\nSimilarly, when the focused element is in a different node tree than documentOrShadowRoot, the element returned will be the host that's located in the same node tree as documentOrShadowRoot if documentOrShadowRoot is a shadow-including inclusive ancestor of the focused element, and null if not.",
+    "documentorshadowroot-activeelement": "Returns the deepest element in the document through which or to which key events are being routed. This is, roughly speaking, the focused element in the document.\n\nFor the purposes of this API, when a child browsing context is focused, its container is focused in the parent browsing context. For example, if the user moves the focus to a text control in an iframe, the iframe is the element returned by the activeElement API in the iframe's node document.\n\nSimilarly, when the focused element is in a different node tree than documentOrShadowRoot, the element returned will be the host that's located in the same node tree as documentOrShadowRoot if documentOrShadowRoot is a shadow-including inclusive ancestor of the focused element, and null if not.",
     "document-hasfocus": "Returns true if key events are being routed through or to the document; otherwise, returns false. Roughly speaking, this corresponds to the document, or a document nested inside this one, being focused.",
     "window-focus": "Moves the focus to the window's browsing context, if any.",
-    "focus": "Moves the focus to the element.\n\nIf the element is a browsing context container, moves the focus to the nested browsing context instead.\n\nBy default, this method also scrolls the element into view. Providing the preventScroll option and setting it to true prevents this behavior.",
+    "focus": "Moves the focus to the element.\n\nIf the element is a browsing context container, moves the focus to its nested browsing context instead.\n\nBy default, this method also scrolls the element into view. Providing the preventScroll option and setting it to true prevents this behavior.",
     "blur": "Moves the focus to the viewport. Use of this method is discouraged; if you want to focus the viewport, call the focus() method on the Document's document element.\n\nDo not use this method to hide the focus ring if you find the focus ring unsightly. Instead, use a CSS rule to override the 'outline' property, and provide a different way to show what element is focused. Be aware that if an alternative focusing style isn't made available, the page will be significantly less usable for people who primarily navigate pages using a keyboard, or those with reduced vision who use focus outlines to help them navigate the page.\n\nFor example, to hide the outline from links and instead use a yellow background to indicate focus, you could use:\n\n```\n:link:focus, :visited:focus { outline: none; background: yellow; color: black; }\n```",
     "contenteditable": "Returns \"true\", \"false\", or \"inherit\", based on the state of the contenteditable attribute.\n\nCan be set, to change that state.\n\nThrows a \"SyntaxError\" DOMException if the new value isn't one of those strings.",
     "iscontenteditable": "Returns true if the element is editable; otherwise, returns false.",
diff --git a/inputfiles/idl/HTML - Web application APIs.commentmap.json b/inputfiles/idl/HTML - Web application APIs.commentmap.json
index fd0809c38..daf972c7c 100644
--- a/inputfiles/idl/HTML - Web application APIs.commentmap.json	
+++ b/inputfiles/idl/HTML - Web application APIs.commentmap.json	
@@ -1,5 +1,7 @@
 {
+    "issecurecontext": "Returns whether or not this global object represents a secure context. [SECURE-CONTEXTS]",
     "origin": "Returns the global object's origin, serialized as string.",
+    "crossoriginisolated": "Returns whether scripts running in this global are allowed to use APIs that require cross-origin isolation. This depends on the `Cross-Origin-Opener-Policy` and `Cross-Origin-Embedder-Policy` HTTP response headers and the \"cross-origin-isolated\" feature.",
     "btoa": "Takes the input data, in the form of a Unicode string containing only characters in the range U+0000 to U+00FF, each representing a binary byte with values 0x00 to 0xFF respectively, and converts it to its base64 representation, which it returns.\n\nThrows an \"InvalidCharacterError\" DOMException exception if the input string contains any out-of-range characters.",
     "atob": "Takes the input data, in the form of a Unicode string containing base64-encoded binary data, decodes it, and returns a string consisting of characters in the range U+0000 to U+00FF, each representing a binary byte with values 0x00 to 0xFF respectively, corresponding to that binary data.\n\nThrows an \"InvalidCharacterError\" DOMException if the input string is not valid base64 data."
 }
diff --git a/inputfiles/idl/HTML - Web storage.commentmap.json b/inputfiles/idl/HTML - Web storage.commentmap.json
index a6f4fd6a8..47f23b66d 100644
--- a/inputfiles/idl/HTML - Web storage.commentmap.json	
+++ b/inputfiles/idl/HTML - Web storage.commentmap.json	
@@ -1,12 +1,12 @@
 {
-    "storage-length": "Returns the number of key/value pairs currently present in the list associated with the object.",
-    "storage-key": "Returns the name of the nth key in the list, or null if n is greater than or equal to the number of key/value pairs in the object.",
-    "storage-getitem": "Returns the current value associated with the given key, or null if the given key does not exist in the list associated with the object.",
-    "storage-setitem": "Sets the value of the pair identified by key to value, creating a new key/value pair if none existed for key previously.\n\nThrows a \"QuotaExceededError\" DOMException exception if the new value couldn't be set. (Setting could fail if, e.g., the user has disabled storage for the site, or if the quota has been exceeded.)",
-    "storage-removeitem": "Removes the key/value pair with the given key from the list associated with the object, if a key/value pair with the given key exists.",
-    "storage-clear": "Empties the list associated with the object of all key/value pairs, if there are any.",
-    "sessionstorage": "Returns the Storage object associated with that origin's session storage area.",
-    "localstorage": "Returns the Storage object associated with that origin's local storage area.\n\nThrows a \"SecurityError\" DOMException if the Document's origin is an opaque origin or if the request violates a policy decision (e.g. if the user agent is configured to not allow the page to persist data).",
+    "storage-length": "Returns the number of key/value pairs.",
+    "storage-key": "Returns the name of the nth key, or null if n is greater than or equal to the number of key/value pairs.",
+    "storage-getitem": "Returns the current value associated with the given key, or null if the given key does not exist.",
+    "storage-setitem": "Sets the value of the pair identified by key to value, creating a new key/value pair if none existed for key previously.\n\nThrows a \"QuotaExceededError\" DOMException exception if the new value couldn't be set. (Setting could fail if, e.g., the user has disabled storage for the site, or if the quota has been exceeded.)\n\nDispatches a storage event on Window objects holding an equivalent Storage object.",
+    "storage-removeitem": "Removes the key/value pair with the given key, if a key/value pair with the given key exists.\n\nDispatches a storage event on Window objects holding an equivalent Storage object.",
+    "storage-clear": "Removes all key/value pairs, if there are any.\n\nDispatches a storage event on Window objects holding an equivalent Storage object.",
+    "sessionstorage": "Returns the Storage object associated with that window's origin's session storage area.\n\nThrows a \"SecurityError\" DOMException if the Document's origin is an opaque origin or if the request violates a policy decision (e.g., if the user agent is configured to not allow the page to persist data).",
+    "localstorage": "Returns the Storage object associated with window's origin's local storage area.\n\nThrows a \"SecurityError\" DOMException if the Document's origin is an opaque origin or if the request violates a policy decision (e.g., if the user agent is configured to not allow the page to persist data).",
     "storageevent-key": "Returns the key of the storage item being changed.",
     "storageevent-oldvalue": "Returns the old value of the key of the storage item whose value is being changed.",
     "storageevent-newvalue": "Returns the new value of the key of the storage item whose value is being changed.",
diff --git a/inputfiles/idl/HTML - Web workers.commentmap.json b/inputfiles/idl/HTML - Web workers.commentmap.json
index 492e889bc..1fbefe315 100644
--- a/inputfiles/idl/HTML - Web workers.commentmap.json	
+++ b/inputfiles/idl/HTML - Web workers.commentmap.json	
@@ -1,7 +1,7 @@
 {
     "workerglobalscope-self": "Returns workerGlobal.",
     "workerglobalscope-location": "Returns workerGlobal's WorkerLocation object.",
-    "worker-navigator": "Returns workerGlobal's WorkerNavigator object.",
+    "workerglobalscope-navigator": "Returns workerGlobal's WorkerNavigator object.",
     "workerglobalscope-importscripts": "Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss).",
     "dedicatedworkerglobalscope-name": "Returns dedicatedWorkerGlobal's name, i.e. the value given to the Worker constructor. Primarily useful for debugging.",
     "dedicatedworkerglobalscope-postmessage": "Clones message and transmits it to the Worker object associated with dedicatedWorkerGlobal. transfer can be passed as a list of objects that are to be transferred rather than cloned.",
diff --git a/inputfiles/idl/Streams.commentmap.json b/inputfiles/idl/Streams.commentmap.json
index 47dc90aaa..4ac8f33d9 100644
--- a/inputfiles/idl/Streams.commentmap.json
+++ b/inputfiles/idl/Streams.commentmap.json
@@ -1,7 +1,7 @@
 {
     "readablestreamgetreaderoptions-mode": "Creates a ReadableStreamBYOBReader and locks the stream to the new reader.\n\nThis call behaves the same way as the no-argument variant, except that it only works on readable byte streams, i.e. streams which were constructed specifically with the ability to handle \"bring your own buffer\" reading. The returned BYOB reader provides the ability to directly read individual chunks from the stream via its read() method, into developer-supplied buffers, allowing more precise control over allocation.",
     "readablewritablepair-writable": "Provides a convenient, chainable way of piping this readable stream through a transform stream (or any other { writable, readable } pair). It simply pipes the stream into the writable side of the supplied pair, and returns the readable side for further use.\n\nPiping a stream will lock it for the duration of the pipe, preventing any other consumer from acquiring a reader.",
-    "streampipeoptions-preventclose": "Pipes this readable stream to a given writable stream destination. The way in which the piping process behaves under various error conditions can be customized with a number of passed options. It returns a promise that fulfills when the piping process completes successfully, or rejects if any errors were encountered.\n\nPiping a stream will lock it for the duration of the pipe, preventing any other consumer from acquiring a reader.\n\nErrors and closures of the source and destination streams propagate as follows:\n\nAn error in this source readable stream will abort destination, unless preventAbort is truthy. The returned promise will be rejected with the source's error, or with any error that occurs during aborting the destination.\n\nAn error in destination will cancel this source readable stream, unless preventCancel is truthy. The returned promise will be rejected with the destination's error, or with any error that occurs during canceling the source.\n\nWhen this source readable stream closes, destination will be closed, unless preventCancel is truthy. The returned promise will be fulfilled once this process completes, unless an error is encountered while closing the destination, in which case it will be rejected with that error.\n\nIf destination starts out closed or closing, this source readable stream will be canceled, unless preventCancel is true. The returned promise will be rejected with an error indicating piping to a closed stream failed, or with any error that occurs during canceling the source.\n\nThe signal option can be set to an AbortSignal to allow aborting an ongoing pipe operation via the corresponding AbortController. In this case, this source readable stream will be canceled, and destination aborted, unless the respective options preventCancel or preventAbort are set.",
+    "streampipeoptions-preventclose": "Pipes this readable stream to a given writable stream destination. The way in which the piping process behaves under various error conditions can be customized with a number of passed options. It returns a promise that fulfills when the piping process completes successfully, or rejects if any errors were encountered.\n\nPiping a stream will lock it for the duration of the pipe, preventing any other consumer from acquiring a reader.\n\nErrors and closures of the source and destination streams propagate as follows:\n\nAn error in this source readable stream will abort destination, unless preventAbort is truthy. The returned promise will be rejected with the source's error, or with any error that occurs during aborting the destination.\n\nAn error in destination will cancel this source readable stream, unless preventCancel is truthy. The returned promise will be rejected with the destination's error, or with any error that occurs during canceling the source.\n\nWhen this source readable stream closes, destination will be closed, unless preventClose is truthy. The returned promise will be fulfilled once this process completes, unless an error is encountered while closing the destination, in which case it will be rejected with that error.\n\nIf destination starts out closed or closing, this source readable stream will be canceled, unless preventCancel is true. The returned promise will be rejected with an error indicating piping to a closed stream failed, or with any error that occurs during canceling the source.\n\nThe signal option can be set to an AbortSignal to allow aborting an ongoing pipe operation via the corresponding AbortController. In this case, this source readable stream will be canceled, and destination aborted, unless the respective options preventCancel or preventAbort are set.",
     "readablestreamiteratoroptions-preventcancel": "Asynchronously iterates over the chunks in the stream's internal queue.\n\nAsynchronously iterating over the stream will lock it, preventing any other consumer from acquiring a reader. The lock will be released if the async iterator's return() method is called, e.g. by breaking out of the loop.\n\nBy default, calling the async iterator's return() method will also cancel the stream. To prevent this, use the stream's values() method, passing true for the preventCancel option.",
     "queuingstrategyinit-highwatermark": "Creates a new ByteLengthQueuingStrategy with the provided high water mark.\n\nNote that the provided high water mark will not be validated ahead of time. Instead, if it is negative, NaN, or not a number, the resulting ByteLengthQueuingStrategy will cause the corresponding stream constructor to throw."
 }
diff --git a/src/emitter.ts b/src/emitter.ts
index 66a97ba2d..b1f01348b 100644
--- a/src/emitter.ts
+++ b/src/emitter.ts
@@ -815,7 +815,7 @@ export function emitWebIdl(webidl: Browser.WebIdl, flavor: Flavor, iterator: boo
 
         // Emit constructor signature
         if (constructor) {
-            emitComments(constructor, printer.print);
+            emitComments(constructor, printer.printLine);
             emitSignatures(constructor, "", "new", printer.printLine);
         }
         else {
diff --git a/src/idlfetcher.ts b/src/idlfetcher.ts
index 05ea14340..b6b1063ea 100644
--- a/src/idlfetcher.ts
+++ b/src/idlfetcher.ts
@@ -199,16 +199,30 @@ function* importNestedList(elements: Element[]) {
  * so that external links can be stable and won't broken.
  */
 function retargetCommentKey(key: string, dom: DocumentFragment) {
-    const [parent, member] = key.split(/-/g);
-    if (!member) {
-        return parent;
+    const match = key.match(/^([^\-]+)-(.+)$/);
+    if (!match) {
+        return key;
     }
+    let [, parent, member] = match;
     const dfn = dom.getElementById(`dom-${key}`);
-    if (!dfn || !dfn.dataset.dfnFor) {
-        // The optional third word is for overloads and can be safely ignored.
-        return `${parent}-${member}`;
+    if (dfn) {
+        if (dfn.dataset.dfnFor) {
+            parent = dfn.dataset.dfnFor;
+        }
+        if (member === 'constructor' || dfn.dataset.dfnType === 'constructor') {
+            member = 'constructor';
+        } else {
+            member = dfn.textContent!.trim();
+            // Remove arguments from methods like `createElement(localName, options)`
+            member = member.replace(/\([\s\S]*$/, '');
+            // Remove target from method calls like `document.write(...)`
+            member = member.replace(/^[^.]+\./, '');
+        }
+    }
+    if (!member) {
+        return parent.toLowerCase();
     }
-    return `${dfn.dataset.dfnFor.toLowerCase()}-${member}`;
+    return `${parent.toLowerCase()}-${member.toLowerCase()}`;
 }
 
 /**
diff --git a/src/widlprocess.ts b/src/widlprocess.ts
index e5daec02c..9eca22a8f 100644
--- a/src/widlprocess.ts
+++ b/src/widlprocess.ts
@@ -172,6 +172,9 @@ function convertInterfaceCommon(i: webidl2.InterfaceType | webidl2.InterfaceMixi
             };
         }
     }
+    if (result.constructor) {
+        addComments(result.constructor, commentMap, i.name, 'constructor');
+    }
 
     return result;
 }