diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index 85d52c4f..e69e6d9c 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -37,7 +37,8 @@ make
 If the build completes but the `extracted-files/tags/` directory is empty, run the URI extraction manually:
 ```bash
 cd build
-python3 uri-def.py ../specification/gedcom*.md ../extracted-files/tags
+python3 extract-yaml.py --spec=../specification/ --dest=../extracted-files/
+python3 yaml-to-tsv.py --dest=../extracted-files/ ../extracted-files/tags
 ```
 
 This command generates:
@@ -94,7 +95,8 @@ mkdir -p ../extracted-files/tags
 make
 
 # If tags directory is empty, run URI extraction manually
-python3 uri-def.py ../specification/gedcom*.md ../extracted-files/tags
+python3 extract-yaml.py --spec=../specification/ --dest=../extracted-files/
+python3 yaml-to-tsv.py --dest=../extracted-files/ ../extracted-files/tags
 
 # Verify generated files exist
 ls -la ../specification/gedcom.html ../specification/gedcom.pdf
@@ -117,7 +119,7 @@ The repository has automated workflows that run on pushes and pull requests:
 - Creates PRs with updated extracted files if changes detected
 - Uses commands:
   - `python3 extract-grammars.py ../specification/gedcom*.md ../extracted-files/`
-  - `python3 uri-def.py ../specification/gedcom*.md ../extracted-files/tags`
+  - `python3 extract-yaml.py --spec=../specification/ --dest=../extracted-files/`
 
 ## Repository Structure
 
@@ -144,7 +146,8 @@ The repository has automated workflows that run on pushes and pull requests:
 - `hyperlink.py` - Adds hyperlinks to markdown 
 - `hyperlink-code.py` - Adds hyperlinks to code blocks in HTML
 - `extract-grammars.py` - Extracts ABNF and structure grammars
-- `uri-def.py` - Extracts tag definitions and generates YAML files
+- `extract-yaml.py` - Extracts tag definitions and generates YAML files
+- `yaml-to-tsv.py` - Extracts TSV files from YAML files
 - `push_to_gedcomio.py` - Uploads to gedcom.io (requires special access)
 
 ## Common Development Tasks
@@ -195,4 +198,4 @@ If build fails:
 The build process emits CSS-related warnings from weasyprint - these are normal and documented. Only stop the build for actual errors, not warnings.
 
 ### File Publishing
-Publishing to gedcom.io requires access to the separate GEDCOM.io repository and is not part of normal development workflows.
\ No newline at end of file
+Publishing to gedcom.io requires access to the separate GEDCOM.io repository and is not part of normal development workflows.
diff --git a/.github/workflows/generate-files.yml b/.github/workflows/generate-files.yml
index f37f134d..eb296fbb 100644
--- a/.github/workflows/generate-files.yml
+++ b/.github/workflows/generate-files.yml
@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: Check out GEDCOM
-        uses: actions/checkout@v6
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1  # v7.0.1
 
       - name: Get the branch name
         id: extract_branch
diff --git a/.github/workflows/propagate-main-to-v7.1.yml b/.github/workflows/propagate-main-to-v7.1.yml
index b17d02bc..f381ef3d 100644
--- a/.github/workflows/propagate-main-to-v7.1.yml
+++ b/.github/workflows/propagate-main-to-v7.1.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Check out GEDCOM
-        uses: actions/checkout@v6
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1  # v7.0.1
 
       - name: Set git config
         env:
diff --git a/.github/workflows/validate-yaml.yml b/.github/workflows/validate-yaml.yml
index 70e2fb92..2f91ebfd 100644
--- a/.github/workflows/validate-yaml.yml
+++ b/.github/workflows/validate-yaml.yml
@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout GEDCOM
-        uses: actions/checkout@v6
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1  # v7.0.1
 
       - name: Validate YAML
         run: yamllint .
diff --git a/LICENSE b/LICENSE
index 8aae145c..2455ff08 100644
--- a/LICENSE
+++ b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 1984-2025 Intellectual Reserve, Inc. All rights reserved. A service provided by The Church of Jesus Christ of Latter-day Saints.
+   Copyright 1984-2026 Intellectual Reserve, Inc. All rights reserved. A service provided by The Church of Jesus Christ of Latter-day Saints.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/NOTICE b/NOTICE
index d3423d84..576452cf 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,7 +1,7 @@
 NOTICE:
 
 This work comprises, is based on, or is derived from the FAMILYSEARCH GEDCOM™
-Specification, © 1984-2025 Intellectual Reserve, Inc. All rights reserved.
+Specification, © 1984-2026 Intellectual Reserve, Inc. All rights reserved.
 
 "FAMILYSEARCH GEDCOM™" and "FAMILYSEARCH®" are trademarks of Intellectual
 Reserve, Inc. and may not be used except as allowed by the Apache 2.0 license
diff --git a/README.md b/README.md
index f6893b50..1bd06d9c 100644
--- a/README.md
+++ b/README.md
@@ -15,13 +15,13 @@ If you are looking for FamilySearch's GEDCOM 5.5.1 Java parser, which previously
 	- `specification/gedcom-`number`-`title`.md` files are the source documents used to define the FamilySearch GEDCOM specification. It is written in pandoc-flavor markdown and is intended to be more easily written than read. It is split into several files (ordered by the integer in their names) to facilitate comparing files.
 	- In a local check-out, this is also where the build scripts place rendered files `gedcom.html` and `gedcom.pdf`; see [releases](releases/latest) for a pre-rendered copy of these.
 	- [`specification/terms/`](specification/terms/)
-		- YAML files to be served in the <https://gedcom.io/terms/v7/> namespace, augmenting those automatically extracted from the specification itself by [`build/uri-def.py`](build/uri-def.py).
+		- YAML files to be served in the <https://gedcom.io/terms/v7/> namespace, augmenting those automatically extracted from the specification itself by [`build/extract-yaml.py`](build/extract-yaml.py).
 - [`build/`](build/) contains files needed to render the specification
 	- See [`build/README.md`](build/) for more
 - [`extracted-files/`](extracted-files/) contains digested information automatically extracted from the specification. All files in this directory are automatically generated by scripts in the [`build/`](build/) directory.
 	- [`extracted-files/grammar.abnf`](extracted-files/grammar.abnf) contains all the character-level ABNF for parsing lines and datatypes.
 	- [`extracted-files/grammar.gedstruct`](extracted-files/grammar.gedstruct) contains a custom structure organization metasyntax.
-	- various `.tsv` files to assist automated validation of files, including:
+	- various `.tsv` files to assist automated validation of files, extracted from the YAML files by [`build/yaml-to-tsv.py`](build/yaml-to-tsv.py), including:
 		- [`extracted-files/cardinalities.tsv`](extracted-files/cardinalities.tsv) with columns "superstructure type ID, substructure type ID, cardinality marker"
 		- [`extracted-files/enumerations.tsv`](extracted-files/enumerations.tsv) with columns "superstructure type ID, enumeration string, enumeration ID"
 		- [`extracted-files/payloads.tsv`](extracted-files/payloads.tsv) with columns "structure type ID, payload type"
diff --git a/build/Makefile b/build/Makefile
index 8b97cf85..0d010db0 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -21,6 +21,7 @@ $(HTML_FILE): hyperlink-code.py GEDCOM-tmp.html
 	python3 hyperlink-code.py GEDCOM-tmp.html $(HTML_FILE)
 
 $(TAGDEFS): $(MD_FILES) $(TERMS_FILES) $(EXTDIR)grammar.gedstruct extract-yaml.py
+	mkdir -p $(TAGDEFS)
 	python3 extract-yaml.py --spec=$(SPECDIR) --dest=$(EXTDIR)
 	rsync -au $(TERMS_FILES) $(EXTDIR)tags
 	python3 yaml-to-tsv.py --dest=$(EXTDIR) $(TAGDEFS)
diff --git a/build/extract-yaml.py b/build/extract-yaml.py
index 9aa656aa..146499a8 100644
--- a/build/extract-yaml.py
+++ b/build/extract-yaml.py
@@ -157,12 +157,12 @@ def type_specific(self) -> list[str]:
       if val is None: ans.append(key+': null')
       elif val == [] or isinstance(val, bool): ans.append(key+': '+str(val).lower())
       elif isinstance(val, str):
-        assert '"' not in val and '\n' not in val, f"Simplified serialization failed for {uri}'s {key}"
+        assert '"' not in val and '\n' not in val, f"Simplified serialization failed for {self.uri}'s {key}"
         ans.append(key+': "'+val+'"')
       else:
         entry = key+':'
         for v in (sorted(val) if key != 'months' else val):
-          assert '"' not in v and '\n' not in v, f"Simplified serialization failed for {uri}'s {key}"
+          assert '"' not in v and '\n' not in v, f"Simplified serialization failed for {self.uri}'s {key}"
           entry += '\n  - "'+v+'"'
         ans.append(entry)
 
@@ -392,7 +392,7 @@ def do_pfx(uri:str) -> str:
         if not uri.startswith('https://gedcom.io'): continue # not ours to define
         if uri not in data: data[uri] = Concept('data type', uri)
         data[uri].set('label', header)
-        if re.search(f'^{typename.replace(':','-')} +=', section, flags=re.M):
+        if re.search(f"^{typename.replace(':','-')} +=", section, flags=re.M):
           data[uri].set('abnf_production', typename.replace(':','-'))
         data[uri].spec.append(section)
 
@@ -436,7 +436,7 @@ def do_pfx(uri:str) -> str:
   
   # step 1: read the files
   src_gedstruct = open(Path(args.dest, 'grammar.gedstruct')).read()
-  src_markdown = '\n\n'.join(open(s).read().replace('\xA0',' ') for s in args.spec.glob('gedcom*.md'))
+  src_markdown = '\n\n'.join(open(s).read().replace('\xA0',' ') for s in sorted(args.spec.glob('gedcom*.md')))
   
   # step 2: find all tables and convert them to {section header: [{column header: column value}]}
   tables = all_tables(src_markdown)
@@ -563,13 +563,18 @@ def do_pfx(uri:str) -> str:
         assert sub.split('/')[4] <= v, f"Enumeration value {sub} incompatible with enumset {uri}"
     
 
-  # step 12: add subsumes for any URI that also exists in earlier minor version
+  # step 12: add subsumes for any URI that also exists in earlier minor version or in subsumes.tsv
   from subprocess import run
   for uri in data:
     if '/v7.1/' in uri:
       res = run(['git','show','main:'+pathof[uri]], capture_output=True)
       if not res.returncode:
         data[uri].subsumes.append(uri.replace('/v7.1/', '/v7/'))
+  with open(Path(args.spec, 'subsumes.tsv'),'r') as subs_csv:
+    subs_csv_header = next(subs_csv)
+    for line in subs_csv:
+      old,new = line.strip('\n\r').split('\t')
+      if new in data: data[new].subsumes.append(old)
 
   # step 13: write all the YAML files
   for uri in data:
diff --git a/build/hyperlink-code.py b/build/hyperlink-code.py
index e9fca01d..d8baaf7c 100644
--- a/build/hyperlink-code.py
+++ b/build/hyperlink-code.py
@@ -44,7 +44,6 @@ def anchorify(m):
     return full
 
 doc = re.sub(r'<code>(g7:[^<]*)</code></h', r'<code class="uri">\1</code></h', doc)
-doc = re.sub(r'<code>(g7.1:[^<]*)</code></h', r'<code class="uri">\1</code></h', doc)
 
 chunks = re.split(r'(<pre[^>]*ged(?:struct|com)[^>]*>.*?</pre>)', doc, flags=re.DOTALL)
 
diff --git a/build/hyperlink.py b/build/hyperlink.py
index 1fe7a24e..4dd9abf4 100644
--- a/build/hyperlink.py
+++ b/build/hyperlink.py
@@ -20,10 +20,6 @@ def slugify(bit):
         si = bit.rfind('`g7:')+4
         ei = bit.find('`', si)
         slug = bit[si:ei].replace('#','-')
-    elif '`g7.1:' in bit:
-        si = bit.rfind('`g7.1:')+6
-        ei = bit.find('`', si)
-        slug = bit[si:ei].replace('#','-')
     elif '`' in bit:
         bit = re.search('`[A-Z0-9_`.]+`', bit)
         slug = bit.group(0).replace('`','').replace('.','-')
@@ -91,7 +87,7 @@ def abnf(m):
             slug = table_tags[m.group(1)]
             return linkify(m.group(0), slug)
         return m.group(0)
-    uried = re.sub(r'(?<![\[.`])`g7(?:\.1)?:[-A-Z0-9a-z`._#]+`', repl, line)
+    uried = re.sub(r'(?<![\[.`])`g7:[-A-Z0-9a-z`._#]+`', repl, line)
     if istable: return uried
     tagged = re.sub(r'(?<![\[.`])`[A-Z0-9`._#]+`', repl, uried)
     abnfed = re.sub(r'(?<![\[.`])`([A-Za-z0-9]+)`', abnf, tagged)
diff --git a/build/yaml-to-tsv.py b/build/yaml-to-tsv.py
index c73ea5a6..1d13b394 100644
--- a/build/yaml-to-tsv.py
+++ b/build/yaml-to-tsv.py
@@ -40,9 +40,10 @@
       rows[(sup, uri)] = card
     for sub,card in obj['substructures'].items():
       if rows.get((uri, sub),card) != card:
-        raise Error(f"{uri} and {sub} disagree about their mutual cardinality")
+        raise Exception(f"{uri} and {sub} disagree about their mutual cardinality")
       rows[(uri, sub)] = card
 with open(Path(args.dest, "cardinalities.tsv"), 'w') as dst:
+  print('superstructure\tstructure\tcardinality', file=dst)
   for row in sorted([k+(v,) for k,v in rows.items()]):
     print('\t'.join(row), file=dst)
 
@@ -52,10 +53,11 @@
   if obj['type'] == 'enumeration set':
     for u in obj['enumeration values']:
       rows.add((uri,u))
-  if 'vaue of' in obj:
+  if 'value of' in obj:
     for u in obj['value of']:
       rows.add((u,uri))
 with open(Path(args.dest, "enumerationsets.tsv"), 'w') as dst:
+  print('set\tvalue', file=dst)
   for row in sorted(rows):
     print('\t'.join(row), file=dst)
 
@@ -66,6 +68,7 @@
   if obj['type'] == 'structure' and 'enumeration set' in obj:
     rows.add((uri, obj['enumeration set']))
 with open(Path(args.dest, "enumerations.tsv"), 'w') as dst:
+  print('structure\tset', file=dst)
   for row in sorted(rows):
     print('\t'.join(row), file=dst)
 
@@ -76,6 +79,7 @@
   if obj['type'] == 'structure':
     rows.add((uri, obj['payload'] or ''))
 with open(Path(args.dest, "payloads.tsv"), 'w') as dst:
+  print('structure\tpayload', file=dst)
   for row in sorted(rows):
     print('\t'.join(row), file=dst)
 
@@ -89,6 +93,8 @@
         rows.add((sup, obj['standard tag'], uri))
       for tag in obj.get('extension tags',[]):
         rows.add((sup, tag, uri))
+      for tag in obj.get('nonconformant tags',[]):
+        rows.add((sup, tag, uri))
     if len(obj['superstructures']) == 0:
       if 'standard tag' in obj:
         rows.add(('', obj['standard tag'], uri))
@@ -100,5 +106,6 @@
       for tag in data[sub].get('extension tags',[]):
         rows.add((uri, tag, sub))
 with open(Path(args.dest, "substructures.tsv"), 'w') as dst:
+  print('superstructure\ttag\tstructure', file=dst)
   for row in sorted(rows):
     print('\t'.join(row), file=dst)
diff --git a/changelog.md b/changelog.md
index 18bec548..6916ad0f 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,14 +1,57 @@
-# v7.1 branch
+# `main` branch
 
-- New structures:
-    - `HEAD`.`TITL` for adding a title to an entire dataset
-    - `HEAD`.`DESC` for adding a description of an entire dataset
-    - Add `RESN` to `SOUR`, `REPO`, `SUBM`, and `SNOTE` records
-    - Add `KIND` with enumerated payload to `NOTE` and `SNOTE` for indicating the kind of information contained in the note
-    - Add `KIND` with enumerated payload to `BIRT` events for indicating the kind of birth
-- Deprecation:
-    - `HEAD`.`SOUR`.`DATA` is deprecated
+- Clarify that an `OBJE`.`SOUR`.`OBJE` should not point to its own containing record. #765
 
+- Note that `BEF` and `AFT` are used differently by different researchers. #775
+
+- Various copy edits. #752, #739
+
+# Version 7.0.18
+
+- Fixed typo in the ABNF for the Longitude data type introduced in 7.0.17. Because ABNF is machine-readable, this typo caused some applications using 7.0.17 to fail to parse valid data. 7.0.17 should not be used by applications utilizing the ABNF in the specification in their tooling.
+
+# Version 7.0.17
+
+- Add URI, Latitude, Longitude, and Tag definition data types.
+    
+    Previously the formats permitted for these were specified in plain text with the corresponding structure types.
+    Those definitions have been moved to the data types section to better match how other data types are defined in the specification.
+
+- Clarify the deprecation of older extensions that use non-underscore tags.
+
+    These violated the standard in both 7.0 and 5.5.1, but exist in the wild and there was unclear text "deprecating" them when they were never supported to begin with. That has been changed to be more clear about when it is an extension-defined substructure and when it violates the specification.
+
+- Clarify how file paths encode non-ASCII characters.
+
+- Clarify rules for pointer-based cycles:
+    
+    - A cycle asserting someone is their own ancestor (such as being both the `CHIL` and `FAMS` of the same person) is unlikely to be correct, but is permitted by GEDCOM.
+    
+    - A self-referential `ALIA` is (`INDI`.`AILA` pointing to the `INDI`) is meaningless and prohibited.
+    
+    - A `SOUR`-`OBJE` cycle (the source of an image is the image itself) is meaningless and prohibited.
+
+- Clarify that extension media types for notes (such as `text/markdown` that several applications are known to employ) do not require extension tags, being covered by the existing standard.
+
+- Clarify the wording of the `ELECTRONIC` enumerated value.
+
+- Clarify the wording of the `AGE` structure generally and `HUSB`.`AGE` and `WIFE`.`AGE` in particular.
+
+- Add example of `PHRASE` used with a non-`OTHER` enumeration value.
+
+- Update UUID defintion from RFC 4122 to RFC 9562
+
+- Remove redundant and confusing references to RFC 3986, which were subsumed by existing references to WHATWG URL.
+
+- Note that `FILE` payloads and GEDZIP file paths follow distinct standards, with the former using percent-escaping but the latter not.
+
+- Note that GEDZIP inherits from zip the ability to have multiple levels of compression, with some suggestions on performance implications of the chosen compression level.
+
+- Note that GEDZIP inherits from zip the ability to encrypt file contents, but not file names or sizes.
+
+- Note how `ALIA` is known to be used by existing applications and users.
+
+- Various typo corrections.
 
 # Version 7.0.16
 
@@ -451,6 +494,7 @@ Various ambiguities were identified in version 5.5.1: some due to poor wording,
 
 - Name pieces are not comma separated.
 
+- The use of "after" and "before" in defining date ranges was ambiguous, with users in some regions interpreting "after 1800" to mean after the *end* of 1800 and others to mean after the *beginning* of 1800, often with each believing their interpretation is the obvious linguistic meaning and not thinking it is ambiguous. To help resolve this, 7.0 now uses "no earlier than" and "no later than" instead, which seems to be consistently interpreted by people from many regions and is inclusive of both previous meanings.
 
 ## Specification refactoring
 
diff --git a/specification/gedcom-0-introduction.md b/specification/gedcom-0-introduction.md
index 161c21c6..dcbe4769 100644
--- a/specification/gedcom-0-introduction.md
+++ b/specification/gedcom-0-introduction.md
@@ -1,10 +1,10 @@
 ---
 title: The FamilySearch GEDCOM Specification
-subtitle: 7.0.16
+subtitle: 7.0.18
 email: GEDCOM@FamilySearch.org
 copyright: |
     :::{style="page-break-after: always;page-break-before: always;"}
-    Copyright 1984–2025 Intellectual Reserve, Inc. All rights reserved. A service provided by The Church of Jesus Christ of Latter-day Saints.
+    Copyright 1984–2026 Intellectual Reserve, Inc. All rights reserved. A service provided by The Church of Jesus Christ of Latter-day Saints.
     
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ copyright: |
     
     > NOTICE:
     > 
-    > This work comprises, is based on, or is derived from the FAMILYSEARCH GEDCOM™ Specification, © 1984-2025 Intellectual Reserve, Inc. All rights reserved.
+    > This work comprises, is based on, or is derived from the FAMILYSEARCH GEDCOM™ Specification, © 1984-2026 Intellectual Reserve, Inc. All rights reserved.
     >
     > "FAMILYSEARCH GEDCOM™" and "FAMILYSEARCH®" are trademarks of Intellectual Reserve, Inc. and may not be used except as allowed by the Apache 2.0 license that governs this work or as expressly authorized in writing and in advance by Intellectual Reserve, Inc.
     :::
@@ -147,7 +147,6 @@ is shorthand for a URI beginning with the corresponding URI prefix
 | Short Prefix | URI Prefix                          |
 |:-------------|:------------------------------------|
 | `g7`         | `https://gedcom.io/terms/v7/`       |
-| `g7.1`       | `https://gedcom.io/terms/v7.1/`     |
 | `xsd`        | `http://www.w3.org/2001/XMLSchema#` |
 | `dcat`       | `http://www.w3.org/ns/dcat#`        |
 
diff --git a/specification/gedcom-1-hierarchical-container-format.md b/specification/gedcom-1-hierarchical-container-format.md
index 13fb90b0..fed052af 100644
--- a/specification/gedcom-1-hierarchical-container-format.md
+++ b/specification/gedcom-1-hierarchical-container-format.md
@@ -176,9 +176,9 @@ The tag `ADOP` is used in this document to represent two structure types.
 Which one is meant can be identified by the superstructure type as follows:
 
 | Superstructure type | Structure type identified by tag `ADOP` |
-|---------------------|-----------------------------------------|
-| `g7.1:record-INDI`  | `g7:ADOP`                               |
-| `g7:ADOP-FAMC`      | `g7:FAMC-ADOP`                          |
+|------------------|------------------|
+| `g7:record-INDI` | `g7:ADOP`        |
+| `g7:ADOP-FAMC`   | `g7:FAMC-ADOP`   |
 
 An [extension-defined substructure](#extensions) could also be used to place either of these structure types in extension superstructures.
 
@@ -319,7 +319,7 @@ Extensions cannot change existing meanings, cardinalities, or calendars.
 A **tagged extension structure** is a structure whose tag matches production `extTag`. Tagged extension structures may appear as records or substructures of any other structure. Their meaning is defined by their tag, as is discussed more fully in the section [Extension Tags].
 
 Any substructure of a tagged extension structure that uses a tag matching `stdTag` is an **extension-defined substructure**.
-Substructures of an extension-defined substructure that uses a tag matching `stdTag` are also extension-defined substructures, but this specification deprecates using a `stdTag` with a definition that does not match any standard type with that tag.
+Substructures of an extension-defined substructure that uses a tag matching `stdTag` are also extension-defined substructures.
 The meaning and use of each extension-defined substructure is defined by the tagged extension structure it occurs within, not by its tag alone nor by this specification.
 
 :::example
@@ -343,7 +343,9 @@ deprecated.
 - Even though both `DATE`s appear to have `g7:type-DATE` payloads, we can't know that is the intended data type without consulting the defining specifications of `_LOC` and `_POP`, respectively. The first might be a `g7:type-DATE#period` and the second a `g7:type-DATE#exact`, for example.
 :::
 
-If an extension-defined substructure has a tag that is also used by one or more standard structures, its meaning and payload type should match at least one of those standard structure types.
+Extension-defined substructures should match the structure type, payload, and substructure collection of at least one
+standard type with the same tag, though it can add more substructures to the substructure collection.
+This specification deprecates using a `stdTag` with a definition that does not match any standard type with that tag.
 
 :::example
 An extension-defined substructure with tag "`DATE`" should provide a date or date period relevant to its superstructure, as do all `DATE`-tagged structures in this specification. Extensions should not use "`DATE`" to tag a structure describing anything else (even something that might reasonably be abbreviated "date", such as someone an individual dated).
diff --git a/specification/gedcom-2-data-types.md b/specification/gedcom-2-data-types.md
index 08afb038..65d6e35b 100644
--- a/specification/gedcom-2-data-types.md
+++ b/specification/gedcom-2-data-types.md
@@ -110,7 +110,6 @@ In addition to the constraints above:
     All known calendars restrict `day` to be between 1 and a month-specific maximum.
     The largest known maximum is 36, and most months in most calendars have a lower maximum.
 - No calendar names, months, or epochs match `dateRestrict`.
-- Extension calendars (those with `extTag` for their `calendar`) must use `extTag`, not `stdTag`, for months.
 
 It is recommended that calendars avoid using a single tag to refer to both a month and an epoch.
 
@@ -130,6 +129,20 @@ The grammar above allows for `date`s to be preceded by various words. The meanin
 |`CAL` *x* |*x* is calculated from other data.          |
 |`EST` *x* |Exact date unknown, but near *x*; and *x* is calculated from other data.|
 
+:::note
+`AFT` and `BEF` were introduced in 5.0 without definition,
+defined with the single words "after" and "before" in 5.3,
+and defined as "event happened before/after the given date" in 5.4 through 5.5.1.
+Those definitions suggest that `AFT 1850` would mean "1 JAN 1851 or later,"
+while under the 7.0 definition `AFT 1850` means "1 JAN 1850 or later."
+
+Given a source dated 1850 that asserts something had happened in the past
+(which could mean earlier that same year or in an earlier year),
+some users encode that as `BEF 1850` and others as `BEF 1851`.
+Both user entries are consistent with the source under the 7.0 definition,
+while only the second is consistent with the source under the 5.x definition.
+:::
+
 Known calendars and tips for handling dual dating and extension calendars are given in [Appendix A: Calendars and Dates](#A-calendars).
 
 `DateValue` and `DatePeriod` payloads may also be the empty string if no suitable form is known but a substructure (such as a `PHRASE` or `TIME`) is desired.
@@ -380,7 +393,7 @@ rather, they are used as machine-readable identifiers with formally-defined mean
 
 The payload is a "URI Reference" as defined in [RFC 3986 section 4.1](https://www.rfc-editor.org/rfc/rfc3986#section-4.1) with ABNF production `URI-reference`.
 The URI Reference is a more restrictive syntax than the URL Strings permitted by the [File Path] data type,
-faciltiating easier automated equality tests between URIs.
+facilitating easier automated equality tests between URIs.
 
 Relative URIs should be avoided in datasets that are expected to be shared on the web or with unknown parties,
 but may be appropriate for close collaboration between parties with a shared base URI.
@@ -433,7 +446,7 @@ Minutes and seconds are not used and should be converted to fractional degrees p
 The number of degrees is limited by definition to be between 0 (the prime meridian) and 180 (the 180th meridian).
 
 ```abnf
-Longitude = ("N" / "S") upto180 [ "." 1*digit]
+Longitude = ("E" / "W") upto180 [ "." 1*digit]
 upto180  = "180" / "1" upto7 digit / [["0"] digit] digit
 upto7    = "0" / "1" / "2" / "3" / "4" / "5" / "6" / "7"
 ```
diff --git a/specification/gedcom-3-structures-1-organization.md b/specification/gedcom-3-structures-1-organization.md
index 4855b64e..196b6f96 100644
--- a/specification/gedcom-3-structures-1-organization.md
+++ b/specification/gedcom-3-structures-1-organization.md
@@ -70,7 +70,7 @@ The intent of this metasyntax is to resemble the line encoding of allowable stru
         
         - `@<XREF:`tag`>@` means a pointer to a structure with this cross-reference template; `@VOID@` is also permitted.
         - `<`data type`>` means a non-pointer payload, as described in [Data types](#datatypes). If the data type allows the empty string, the payload may be omitted.
-        - `[`text`|<NULL>]` means the payload is optional but if present must be the given text.
+       - `[`text`|<NULL>]` means the payload is optional but if present must be the given text. The `[`text`|<NULL>]` payload descriptor is only used in this version of the specification for `[Y|<NULL>]` in event structures, as explained in [Events](#events).
         
         If there is a payload descriptor, a payload that matches the payload is required of the described structure unless the descriptor says the payload is optional.
 
@@ -129,7 +129,7 @@ n <<SUBMITTER_RECORD>>                     {1:1}
 #### `HEADER` :=
 
 ```gedstruct
-n HEAD                                     {1:1}  g7.1:HEAD
+n HEAD                                     {1:1}  g7:HEAD
   +1 GEDC                                  {1:1}  g7:GEDC
      +2 VERS <Special>                     {1:1}  g7:GEDC-VERS
   +1 SCHMA                                 {0:1}  g7:SCHMA
@@ -150,20 +150,12 @@ n HEAD                                     {1:1}  g7.1:HEAD
   +1 DEST <Special>                        {0:1}  g7:DEST
   +1 DATE <DateExact>                      {0:1}  g7:HEAD-DATE
      +2 TIME <Time>                        {0:1}  g7:TIME
-  +1 SUBM @<XREF:SUBM>@                    {0:1}  g7.1:SUBM
+  +1 SUBM @<XREF:SUBM>@                    {0:1}  g7:SUBM
   +1 COPR <Text>                           {0:1}  g7:COPR
   +1 LANG <Language>                       {0:1}  g7:HEAD-LANG
   +1 PLAC                                  {0:1}  g7:HEAD-PLAC
      +2 FORM <List:Text>                   {1:1}  g7:HEAD-PLAC-FORM
-  +1 TITL <Text>                           {0:1}  g7.1:HEAD-TITL
-     +2 LANG <Language>                    {0:1}  g7:LANG
-     +2 TRAN <Text>                        {0:M}  g7.1:TEXT-TRAN
-        +3 LANG <Language>                 {1:1}  g7:LANG
-  +1 DESC <Text>                           {0:1}  g7.1:HEAD-DESC
-     +2 LANG <Language>                    {0:1}  g7:LANG
-     +2 TRAN <Text>                        {0:M}  g7.1:TEXT-TRAN
-        +3 LANG <Language>                 {1:1}  g7:LANG
-  +1 <<NOTE_STRUCTURE>>                    {0:M}
+  +1 <<NOTE_STRUCTURE>>                    {0:1}
 ```
 
 The header pseudo-structure provides metadata about the entire dataset.
@@ -186,19 +178,19 @@ A few substructures of note:
 #### `FAMILY_RECORD` :=
 
 ```gedstruct
-n @XREF:FAM@ FAM                           {1:1}  g7.1:record-FAM
+n @XREF:FAM@ FAM                           {1:1}  g7:record-FAM
   +1 RESN <List:Enum>                      {0:1}  g7:RESN
   +1 <<FAMILY_ATTRIBUTE_STRUCTURE>>        {0:M}
   +1 <<FAMILY_EVENT_STRUCTURE>>            {0:M}
   +1 <<NON_EVENT_STRUCTURE>>               {0:M}
-  +1 HUSB @<XREF:INDI>@                    {0:1}  g7.1:FAM-HUSB
+  +1 HUSB @<XREF:INDI>@                    {0:1}  g7:FAM-HUSB
      +2 PHRASE <Text>                      {0:1}  g7:PHRASE
-  +1 WIFE @<XREF:INDI>@                    {0:1}  g7.1:FAM-WIFE
+  +1 WIFE @<XREF:INDI>@                    {0:1}  g7:FAM-WIFE
      +2 PHRASE <Text>                      {0:1}  g7:PHRASE
-  +1 CHIL @<XREF:INDI>@                    {0:M}  g7.1:CHIL
+  +1 CHIL @<XREF:INDI>@                    {0:M}  g7:CHIL
      +2 PHRASE <Text>                      {0:1}  g7:PHRASE
   +1 <<ASSOCIATION_STRUCTURE>>             {0:M}
-  +1 SUBM @<XREF:SUBM>@                    {0:M}  g7.1:SUBM
+  +1 SUBM @<XREF:SUBM>@                    {0:M}  g7:SUBM
   +1 <<LDS_SPOUSE_SEALING>>                {0:M}
   +1 <<IDENTIFIER_STRUCTURE>>              {0:M}
   +1 <<NOTE_STRUCTURE>>                    {0:M}
@@ -239,7 +231,7 @@ the `INDI` record must use a `FAMC` to point to the `FAM` record.
 An `INDI` record should not have multiple `FAMS` substructures pointing to the same `FAM`.
 
 A `FAM` record should not have multiple `CHIL` substructures pointing to the same `INDI`; doing so implies a nonsensical birth order.
-An `INDI` record may have multiple `FAMC` substructures pointing to the same `FAM`, but doing so is not recommended.
+An `INDI` record may have multiple `FAMC` substructures pointing to the same `FAM`, for example to indicate a child that was both fostered and adopted by the same family.
 
 Source citations and notes related to the start of a specific child relationship should be placed
 under the child's `BIRT`, `CHR`, or `ADOP` event, rather than under the `FAM` record.
@@ -250,7 +242,7 @@ In most cases that would be an error, though it is theoretically possible that s
 #### `INDIVIDUAL_RECORD` :=
 
 ```gedstruct
-n @XREF:INDI@ INDI                         {1:1}  g7.1:record-INDI
+n @XREF:INDI@ INDI                         {1:1}  g7:record-INDI
   +1 RESN <List:Enum>                      {0:1}  g7:RESN
   +1 <<PERSONAL_NAME_STRUCTURE>>           {0:M}
   +1 SEX <Enum>                            {0:1}  g7:SEX
@@ -258,20 +250,20 @@ n @XREF:INDI@ INDI                         {1:1}  g7.1:record-INDI
   +1 <<INDIVIDUAL_EVENT_STRUCTURE>>        {0:M}
   +1 <<NON_EVENT_STRUCTURE>>               {0:M}
   +1 <<LDS_INDIVIDUAL_ORDINANCE>>          {0:M}
-  +1 FAMC @<XREF:FAM>@                     {0:M}  g7.1:INDI-FAMC
+  +1 FAMC @<XREF:FAM>@                     {0:M}  g7:INDI-FAMC
      +2 PEDI <Enum>                        {0:1}  g7:PEDI
         +3 PHRASE <Text>                   {0:1}  g7:PHRASE
      +2 STAT <Enum>                        {0:1}  g7:FAMC-STAT
         +3 PHRASE <Text>                   {0:1}  g7:PHRASE
      +2 <<NOTE_STRUCTURE>>                 {0:M}
-  +1 FAMS @<XREF:FAM>@                     {0:M}  g7.1:FAMS
+  +1 FAMS @<XREF:FAM>@                     {0:M}  g7:FAMS
      +2 <<NOTE_STRUCTURE>>                 {0:M}
-  +1 SUBM @<XREF:SUBM>@                    {0:M}  g7.1:SUBM
+  +1 SUBM @<XREF:SUBM>@                    {0:M}  g7:SUBM
   +1 <<ASSOCIATION_STRUCTURE>>             {0:M}
-  +1 ALIA @<XREF:INDI>@                    {0:M}  g7.1:ALIA
+  +1 ALIA @<XREF:INDI>@                    {0:M}  g7:ALIA
      +2 PHRASE <Text>                      {0:1}  g7:PHRASE
-  +1 ANCI @<XREF:SUBM>@                    {0:M}  g7.1:ANCI
-  +1 DESI @<XREF:SUBM>@                    {0:M}  g7.1:DESI
+  +1 ANCI @<XREF:SUBM>@                    {0:M}  g7:ANCI
+  +1 DESI @<XREF:SUBM>@                    {0:M}  g7:DESI
   +1 <<IDENTIFIER_STRUCTURE>>              {0:M}
   +1 <<NOTE_STRUCTURE>>                    {0:M}
   +1 <<SOURCE_CITATION>>                   {0:M}
@@ -324,7 +316,7 @@ In most cases that would be an error, though it is theoretically possible that s
 #### `MULTIMEDIA_RECORD` :=
 
 ```gedstruct
-n @XREF:OBJE@ OBJE                         {1:1}  g7.1:record-OBJE
+n @XREF:OBJE@ OBJE                         {1:1}  g7:record-OBJE
   +1 RESN <List:Enum>                      {0:1}  g7:RESN
   +1 FILE <FilePath>                       {1:M}  g7:FILE
      +2 FORM <MediaType>                   {1:1}  g7:FORM
@@ -353,8 +345,7 @@ A `MULTIMEDIA_RECORD` may contain a pointer to a `SOURCE_RECORD` and vice versa.
 #### `REPOSITORY_RECORD` :=
 
 ```gedstruct
-n @XREF:REPO@ REPO                         {1:1}  g7.1:record-REPO
-  +1 RESN <List:Enum>                      {0:1}  g7:RESN
+n @XREF:REPO@ REPO                         {1:1}  g7:record-REPO
   +1 NAME <Text>                           {1:1}  g7:NAME
   +1 <<ADDRESS_STRUCTURE>>                 {0:1}
   +1 PHON <Special>                        {0:M}  g7:PHON
@@ -379,15 +370,12 @@ Until such time, it is recommended that the repository record store current cont
 #### `SHARED_NOTE_RECORD` :=
 
 ```gedstruct
-n @XREF:SNOTE@ SNOTE <Text>                {1:1}  g7.1:record-SNOTE
-  +1 RESN <List:Enum>                      {0:1}  g7:RESN
+n @XREF:SNOTE@ SNOTE <Text>                {1:1}  g7:record-SNOTE
   +1 MIME <MediaType>                      {0:1}  g7:MIME
   +1 LANG <Language>                       {0:1}  g7:LANG
   +1 TRAN <Text>                           {0:M}  g7:NOTE-TRAN
      +2 MIME <MediaType>                   {0:1}  g7:MIME
      +2 LANG <Language>                    {0:1}  g7:LANG
-  +1 KIND <Enum>                           {0:M}  g7.1:NOTE-KIND
-     +2 PHRASE <Text>                      {0:1}  g7:PHRASE
   +1 <<SOURCE_CITATION>>                   {0:M}
   +1 <<IDENTIFIER_STRUCTURE>>              {0:M}
   +1 <<CHANGE_DATE>>                       {0:1}
@@ -427,10 +415,9 @@ A `SHARED_NOTE_RECORD` may contain a pointer to a `SOURCE_RECORD` and vice versa
 #### `SOURCE_RECORD` :=
 
 ```gedstruct
-n @XREF:SOUR@ SOUR                         {1:1}  g7.1:record-SOUR
-  +1 RESN <List:Enum>                      {0:1}  g7:RESN
-  +1 DATA                                  {0:1}  g7.1:DATA
-     +2 EVEN <List:Enum>                   {0:M}  g7.1:DATA-EVEN
+n @XREF:SOUR@ SOUR                         {1:1}  g7:record-SOUR
+  +1 DATA                                  {0:1}  g7:DATA
+     +2 EVEN <List:Enum>                   {0:M}  g7:DATA-EVEN
         +3 DATE <DatePeriod>               {0:1}  g7:DATA-EVEN-DATE
            +4 PHRASE <Text>                {0:1}  g7:PHRASE
         +3 <<PLACE_STRUCTURE>>             {0:1}
@@ -466,8 +453,7 @@ A `SOURCE_RECORD` may contain a pointer to a `MULTIMEDIA_RECORD` and vice versa.
 #### `SUBMITTER_RECORD` :=
 
 ```gedstruct
-n @XREF:SUBM@ SUBM                         {1:1}  g7.1:record-SUBM
-  +1 RESN <List:Enum>                      {0:1}  g7:RESN
+n @XREF:SUBM@ SUBM                         {1:1}  g7:record-SUBM
   +1 NAME <Text>                           {1:1}  g7:NAME
   +1 <<ADDRESS_STRUCTURE>>                 {0:1}
   +1 PHON <Special>                        {0:M}  g7:PHON
@@ -524,7 +510,7 @@ Duplicating information bloats files and introduces the potential for self-contr
 #### `ASSOCIATION_STRUCTURE` :=
 
 ```gedstruct
-n ASSO @<XREF:INDI>@                       {1:1}  g7.1:ASSO
+n ASSO @<XREF:INDI>@                       {1:1}  g7:ASSO
   +1 PHRASE <Text>                         {0:1}  g7:PHRASE
   +1 ROLE <Enum>                           {1:1}  g7:ROLE
      +2 PHRASE <Text>                      {0:1}  g7:PHRASE
@@ -557,7 +543,7 @@ and that individual `@I2@` was the clergy officiating at their baptism.
 #### `CHANGE_DATE` :=
 
 ```gedstruct
-n CHAN                                     {1:1}  g7.1:CHAN
+n CHAN                                     {1:1}  g7:CHAN
   +1 DATE <DateExact>                      {1:1}  g7:DATE-exact
      +2 TIME <Time>                        {0:1}  g7:TIME
   +1 <<NOTE_STRUCTURE>>                    {0:M}
@@ -628,15 +614,15 @@ Conflicting event information should be represented by placing them in separate
 
 ```gedstruct
 [
-n NCHI <Integer>                           {1:1}  g7.1:FAM-NCHI
+n NCHI <Integer>                           {1:1}  g7:FAM-NCHI
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<FAMILY_EVENT_DETAIL>>               {0:1}
 |
-n RESI <Text>                              {1:1}  g7.1:FAM-RESI
+n RESI <Text>                              {1:1}  g7:FAM-RESI
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<FAMILY_EVENT_DETAIL>>               {0:1}
 |
-n FACT <Text>                              {1:1}  g7.1:FAM-FACT
+n FACT <Text>                              {1:1}  g7:FAM-FACT
   +1 TYPE <Text>                           {1:1}  g7:TYPE
   +1 <<FAMILY_EVENT_DETAIL>>               {0:1}
 ]
@@ -670,47 +656,47 @@ Substructures shared by most family events and attributes.
 
 ```` {.gedstruct .long}
 [
-n ANUL [Y|<NULL>]                          {1:1}  g7.1:ANUL
+n ANUL [Y|<NULL>]                          {1:1}  g7:ANUL
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<FAMILY_EVENT_DETAIL>>               {0:1}
 |
-n CENS [Y|<NULL>]                          {1:1}  g7.1:FAM-CENS
+n CENS [Y|<NULL>]                          {1:1}  g7:FAM-CENS
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<FAMILY_EVENT_DETAIL>>               {0:1}
 |
-n DIV [Y|<NULL>]                           {1:1}  g7.1:DIV
+n DIV [Y|<NULL>]                           {1:1}  g7:DIV
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<FAMILY_EVENT_DETAIL>>               {0:1}
 |
-n DIVF [Y|<NULL>]                          {1:1}  g7.1:DIVF
+n DIVF [Y|<NULL>]                          {1:1}  g7:DIVF
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<FAMILY_EVENT_DETAIL>>               {0:1}
 |
-n ENGA [Y|<NULL>]                          {1:1}  g7.1:ENGA
+n ENGA [Y|<NULL>]                          {1:1}  g7:ENGA
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<FAMILY_EVENT_DETAIL>>               {0:1}
 |
-n MARB [Y|<NULL>]                          {1:1}  g7.1:MARB
+n MARB [Y|<NULL>]                          {1:1}  g7:MARB
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<FAMILY_EVENT_DETAIL>>               {0:1}
 |
-n MARC [Y|<NULL>]                          {1:1}  g7.1:MARC
+n MARC [Y|<NULL>]                          {1:1}  g7:MARC
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<FAMILY_EVENT_DETAIL>>               {0:1}
 |
-n MARL [Y|<NULL>]                          {1:1}  g7.1:MARL
+n MARL [Y|<NULL>]                          {1:1}  g7:MARL
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<FAMILY_EVENT_DETAIL>>               {0:1}
 |
-n MARR [Y|<NULL>]                          {1:1}  g7.1:MARR
+n MARR [Y|<NULL>]                          {1:1}  g7:MARR
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<FAMILY_EVENT_DETAIL>>               {0:1}
 |
-n MARS [Y|<NULL>]                          {1:1}  g7.1:MARS
+n MARS [Y|<NULL>]                          {1:1}  g7:MARS
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<FAMILY_EVENT_DETAIL>>               {0:1}
 |
-n EVEN <Text>                              {1:1}  g7.1:FAM-EVEN
+n EVEN <Text>                              {1:1}  g7:FAM-EVEN
   +1 TYPE <Text>                           {1:1}  g7:TYPE
   +1 <<FAMILY_EVENT_DETAIL>>               {0:1}
 ]
@@ -764,70 +750,70 @@ and each is different in purpose:
 
 ```` {.gedstruct .long}
 [
-n CAST <Text>                              {1:1}  g7.1:CAST
+n CAST <Text>                              {1:1}  g7:CAST
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
-n DSCR <Text>                              {1:1}  g7.1:DSCR
+n DSCR <Text>                              {1:1}  g7:DSCR
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
-n EDUC <Text>                              {1:1}  g7.1:EDUC
+n EDUC <Text>                              {1:1}  g7:EDUC
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
-n IDNO <Special>                           {1:1}  g7.1:IDNO
+n IDNO <Special>                           {1:1}  g7:IDNO
   +1 TYPE <Text>                           {1:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
-n NATI <Text>                              {1:1}  g7.1:NATI
+n NATI <Text>                              {1:1}  g7:NATI
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
-n NCHI <Integer>                           {1:1}  g7.1:INDI-NCHI
+n NCHI <Integer>                           {1:1}  g7:INDI-NCHI
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
-n NMR <Integer>                            {1:1}  g7.1:NMR
+n NMR <Integer>                            {1:1}  g7:NMR
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
-n OCCU <Text>                              {1:1}  g7.1:OCCU
+n OCCU <Text>                              {1:1}  g7:OCCU
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
-n PROP <Text>                              {1:1}  g7.1:PROP
+n PROP <Text>                              {1:1}  g7:PROP
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
-n RELI <Text>                              {1:1}  g7.1:INDI-RELI
+n RELI <Text>                              {1:1}  g7:INDI-RELI
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
-n RESI <Text>                              {1:1}  g7.1:INDI-RESI
+n RESI <Text>                              {1:1}  g7:INDI-RESI
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
-n SSN <Special>                            {1:1}  g7.1:SSN
+n SSN <Special>                            {1:1}  g7:SSN
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
-n TITL <Text>                              {1:1}  g7.1:INDI-TITL
+n TITL <Text>                              {1:1}  g7:INDI-TITL
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
-n FACT <Text>                              {1:1}  g7.1:INDI-FACT
+n FACT <Text>                              {1:1}  g7:INDI-FACT
   +1 TYPE <Text>                           {1:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 ]
 ````
 
-Individual attributes; see [Individual Attributes](#individual-attributes) for descriptions of each individual attribute type..
+Individual attributes; see [Individual Attributes](#individual-attributes) for descriptions of each individual attribute type.
 
 :::note
 Individual attribute structures vary as follows:
 
-- `INDI`.`NCHI` and `NMR` have [Integer](#text) payloads; `IDNO` and `SSN` have [Special](#special) payloads; others have [Text](#text) payloads
+- `INDI`.`NCHI` and `NMR` have [Integer](#integer) payloads; `IDNO` and `SSN` have [Special](#special) payloads; others have [Text](#text) payloads
 - `INDI`.`FACT` and `IDNO` require `TYPE`; it's optional for others
 :::
 
@@ -845,101 +831,100 @@ Substructures shared by most individual events and attributes.
 
 ```` {.gedstruct .long}
 [
-n ADOP [Y|<NULL>]                          {1:1}  g7.1:ADOP
+n ADOP [Y|<NULL>]                          {1:1}  g7:ADOP
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
-  +1 FAMC @<XREF:FAM>@                     {0:1}  g7.1:ADOP-FAMC
+  +1 FAMC @<XREF:FAM>@                     {0:1}  g7:ADOP-FAMC
      +2 ADOP <Enum>                        {0:1}  g7:FAMC-ADOP
         +3 PHRASE <Text>                   {0:1}  g7:PHRASE
 |
-n BAPM [Y|<NULL>]                          {1:1}  g7.1:BAPM
+n BAPM [Y|<NULL>]                          {1:1}  g7:BAPM
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
-n BARM [Y|<NULL>]                          {1:1}  g7.1:BARM
+n BARM [Y|<NULL>]                          {1:1}  g7:BARM
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
-n BASM [Y|<NULL>]                          {1:1}  g7.1:BASM
+n BASM [Y|<NULL>]                          {1:1}  g7:BASM
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
-n BIRT [Y|<NULL>]                          {1:1}  g7.1:BIRT
+n BIRT [Y|<NULL>]                          {1:1}  g7:BIRT
   +1 TYPE <Text>                           {0:1}  g7:TYPE
-  +1 KIND <Enum>                           {0:M}  g7.1:BIRT-KIND
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
-  +1 FAMC @<XREF:FAM>@                     {0:1}  g7.1:FAMC
+  +1 FAMC @<XREF:FAM>@                     {0:1}  g7:FAMC
 |
-n BLES [Y|<NULL>]                          {1:1}  g7.1:BLES
+n BLES [Y|<NULL>]                          {1:1}  g7:BLES
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
-n BURI [Y|<NULL>]                          {1:1}  g7.1:BURI
+n BURI [Y|<NULL>]                          {1:1}  g7:BURI
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
-n CENS [Y|<NULL>]                          {1:1}  g7.1:INDI-CENS
+n CENS [Y|<NULL>]                          {1:1}  g7:INDI-CENS
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
-n CHR [Y|<NULL>]                           {1:1}  g7.1:CHR
+n CHR [Y|<NULL>]                           {1:1}  g7:CHR
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
-  +1 FAMC @<XREF:FAM>@                     {0:1}  g7.1:FAMC
+  +1 FAMC @<XREF:FAM>@                     {0:1}  g7:FAMC
 |
-n CHRA [Y|<NULL>]                          {1:1}  g7.1:CHRA
+n CHRA [Y|<NULL>]                          {1:1}  g7:CHRA
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
-n CONF [Y|<NULL>]                          {1:1}  g7.1:CONF
+n CONF [Y|<NULL>]                          {1:1}  g7:CONF
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
-n CREM [Y|<NULL>]                          {1:1}  g7.1:CREM
+n CREM [Y|<NULL>]                          {1:1}  g7:CREM
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
-n DEAT [Y|<NULL>]                          {1:1}  g7.1:DEAT
+n DEAT [Y|<NULL>]                          {1:1}  g7:DEAT
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
-n EMIG [Y|<NULL>]                          {1:1}  g7.1:EMIG
+n EMIG [Y|<NULL>]                          {1:1}  g7:EMIG
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
-n FCOM [Y|<NULL>]                          {1:1}  g7.1:FCOM
+n FCOM [Y|<NULL>]                          {1:1}  g7:FCOM
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
-n GRAD [Y|<NULL>]                          {1:1}  g7.1:GRAD
+n GRAD [Y|<NULL>]                          {1:1}  g7:GRAD
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
-n IMMI [Y|<NULL>]                          {1:1}  g7.1:IMMI
+n IMMI [Y|<NULL>]                          {1:1}  g7:IMMI
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
-n NATU [Y|<NULL>]                          {1:1}  g7.1:NATU
+n NATU [Y|<NULL>]                          {1:1}  g7:NATU
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
-n ORDN [Y|<NULL>]                          {1:1}  g7.1:ORDN
+n ORDN [Y|<NULL>]                          {1:1}  g7:ORDN
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
-n PROB [Y|<NULL>]                          {1:1}  g7.1:PROB
+n PROB [Y|<NULL>]                          {1:1}  g7:PROB
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
-n RETI [Y|<NULL>]                          {1:1}  g7.1:RETI
+n RETI [Y|<NULL>]                          {1:1}  g7:RETI
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
-n WILL [Y|<NULL>]                          {1:1}  g7.1:WILL
+n WILL [Y|<NULL>]                          {1:1}  g7:WILL
   +1 TYPE <Text>                           {0:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 |
-n EVEN <Text>                              {1:1}  g7.1:INDI-EVEN
+n EVEN <Text>                              {1:1}  g7:INDI-EVEN
   +1 TYPE <Text>                           {1:1}  g7:TYPE
   +1 <<INDIVIDUAL_EVENT_DETAIL>>           {0:1}
 ]
@@ -965,21 +950,21 @@ Individual event structures vary as follows:
 
 ```gedstruct
 [
-n BAPL                                     {1:1}  g7.1:BAPL
+n BAPL                                     {1:1}  g7:BAPL
   +1 <<LDS_ORDINANCE_DETAIL>>              {0:1}
 |
-n CONL                                     {1:1}  g7.1:CONL
+n CONL                                     {1:1}  g7:CONL
   +1 <<LDS_ORDINANCE_DETAIL>>              {0:1}
 |
-n ENDL                                     {1:1}  g7.1:ENDL
+n ENDL                                     {1:1}  g7:ENDL
   +1 <<LDS_ORDINANCE_DETAIL>>              {0:1}
 |
-n INIL                                     {1:1}  g7.1:INIL
+n INIL                                     {1:1}  g7:INIL
   +1 <<LDS_ORDINANCE_DETAIL>>              {0:1}
 |
-n SLGC                                     {1:1}  g7.1:SLGC
+n SLGC                                     {1:1}  g7:SLGC
   +1 <<LDS_ORDINANCE_DETAIL>>              {0:1}
-  +1 FAMC @<XREF:FAM>@                     {1:1}  g7.1:FAMC
+  +1 FAMC @<XREF:FAM>@                     {1:1}  g7:FAMC
 ]
 ```
 
@@ -1004,7 +989,7 @@ These ordinances can be performed posthumously by proxy, and the date may reflec
 #### `LDS_SPOUSE_SEALING` :=
 
 ```gedstruct
-n SLGS                                     {1:1}  g7.1:SLGS
+n SLGS                                     {1:1}  g7:SLGS
   +1 <<LDS_ORDINANCE_DETAIL>>              {0:1}
 ```
 
@@ -1012,7 +997,7 @@ Ordinances performed by members of The Church of Jesus Christ of Latter-day Sain
 
 #### `MULTIMEDIA_LINK` :=
 ```gedstruct
-n OBJE @<XREF:OBJE>@                       {1:1}  g7.1:OBJE
+n OBJE @<XREF:OBJE>@                       {1:1}  g7:OBJE
   +1 CROP                                  {0:1}  g7:CROP
      +2 TOP <Integer>                      {0:1}  g7:TOP
      +2 LEFT <Integer>                     {0:1}  g7:LEFT
@@ -1027,10 +1012,13 @@ The optional `CROP` substructure indicates that a subregion of an image represen
 
 The optional `TITL` substructure supersedes any `OBJE.FILE.TITL` substructures included in the `MULTIMEDIA_RECORD`.
 
+A `MULTIMEDIA_LINK` in a `MULTIMEDIA_RECORD` should not point to the `MULTIMEDIA_RECORD` itself.  Applications should
+also ensure they can handle invalid files with such cycles in a safe manner.
+
 #### `NON_EVENT_STRUCTURE` :=
 
 ```gedstruct
-n NO <Enum>                                {1:1}  g7.1:NO
+n NO <Enum>                                {1:1}  g7:NO
   +1 DATE <DatePeriod>                     {0:1}  g7:NO-DATE
      +2 PHRASE <Text>                      {0:1}  g7:PHRASE
   +1 <<NOTE_STRUCTURE>>                    {0:M}
@@ -1060,17 +1048,15 @@ means "no marriage had occurred as of March 24^th^, 1880"
 
 ```gedstruct
 [
-n NOTE <Text>                              {1:1}  g7.1:NOTE
+n NOTE <Text>                              {1:1}  g7:NOTE
   +1 MIME <MediaType>                      {0:1}  g7:MIME
   +1 LANG <Language>                       {0:1}  g7:LANG
   +1 TRAN <Text>                           {0:M}  g7:NOTE-TRAN
      +2 MIME <MediaType>                   {0:1}  g7:MIME
      +2 LANG <Language>                    {0:1}  g7:LANG
-  +1 KIND <Enum>                           {0:M}  g7.1:NOTE-KIND
-     +2 PHRASE <Text>                      {0:1}  g7:PHRASE
   +1 <<SOURCE_CITATION>>                   {0:M}
 |
-n SNOTE @<XREF:SNOTE>@                     {1:1}  g7.1:SNOTE
+n SNOTE @<XREF:SNOTE>@                     {1:1}  g7:SNOTE
 ]
 ```
 
@@ -1117,7 +1103,7 @@ Even when multiple `SURN` tags are used, the `PersonalName` data type identifies
 #### `PERSONAL_NAME_STRUCTURE` :=
 
 ```gedstruct
-n NAME <PersonalName>                      {1:1}  g7.1:INDI-NAME
+n NAME <PersonalName>                      {1:1}  g7:INDI-NAME
   +1 TYPE <Enum>                           {0:1}  g7:NAME-TYPE
      +2 PHRASE <Text>                      {0:1}  g7:PHRASE
   +1 <<PERSONAL_NAME_PIECES>>              {0:1}
@@ -1145,7 +1131,7 @@ Alternative approaches to representing names are being considered for future ver
 #### `PLACE_STRUCTURE` :=
 
 ```gedstruct
-n PLAC <List:Text>                         {1:1}  g7.1:PLAC
+n PLAC <List:Text>                         {1:1}  g7:PLAC
   +1 FORM <List:Text>                      {0:1}  g7:PLAC-FORM
   +1 LANG <Language>                       {0:1}  g7:LANG
   +1 TRAN <List:Text>                      {0:M}  g7:PLAC-TRAN
@@ -1207,14 +1193,14 @@ This specification does not support places where a region name contains a comma.
 #### `SOURCE_CITATION` :=
 
 ```gedstruct
-n SOUR @<XREF:SOUR>@                       {1:1}  g7.1:SOUR
+n SOUR @<XREF:SOUR>@                       {1:1}  g7:SOUR
   +1 PAGE <Text>                           {0:1}  g7:PAGE
   +1 DATA                                  {0:1}  g7:SOUR-DATA
      +2 <<DATE_VALUE>>                     {0:1}
      +2 TEXT <Text>                        {0:M}  g7:TEXT
         +3 MIME <MediaType>                {0:1}  g7:MIME
         +3 LANG <Language>                 {0:1}  g7:LANG
-  +1 EVEN <Enum>                           {0:1}  g7.1:SOUR-EVEN
+  +1 EVEN <Enum>                           {0:1}  g7:SOUR-EVEN
      +2 PHRASE <Text>                      {0:1}  g7:PHRASE
      +2 ROLE <Enum>                        {0:1}  g7:ROLE
         +3 PHRASE <Text>                   {0:1}  g7:PHRASE
@@ -1243,7 +1229,7 @@ A `SOURCE_CITATION` can contain a `NOTE_STRUCTURE`, which in turn can contain a
 #### `SOURCE_REPOSITORY_CITATION` :=
 
 ```gedstruct
-n REPO @<XREF:REPO>@                       {1:1}  g7.1:REPO
+n REPO @<XREF:REPO>@                       {1:1}  g7:REPO
   +1 <<NOTE_STRUCTURE>>                    {0:M}
   +1 CALN <Special>                        {0:M}  g7:CALN
      +2 MEDI <Enum>                        {0:1}  g7:MEDI
diff --git a/specification/gedcom-3-structures-3-meaning.md b/specification/gedcom-3-structures-3-meaning.md
index 082aabb6..e87ffa24 100644
--- a/specification/gedcom-3-structures-3-meaning.md
+++ b/specification/gedcom-3-structures-3-meaning.md
@@ -21,7 +21,7 @@ An event structure asserts the event did occur if any of the following are true:
     </div>
     
     <div class="note">
-
+    
     Version 5.4 (1995) introduced the "event did occur" meaning of event.`DATE`, so it is now well-established in applications and files.
     However, it is common for users to enter a date range with no end without intending to indicate that the event occurred.
     For example, pre 7.0 files sometimes used
@@ -41,7 +41,7 @@ An event structure asserts the event did occur if any of the following are true:
     without intending to imply that `NATU` ever did actually occur.
     Because this is a "sometimes used" rather than a "formally means" situation,
     it is likely that data using 5.x "after meaning not before" *de facto* pattern will be transferred as-is into 7.0 and persist in files for the foreseeable future.
-
+    
     </div>
 
 - There is a `PLAC` substructure
@@ -73,28 +73,28 @@ An assertion that an event did not occur should be encoded using the `NO` struct
 
 Tag | Name<br/>URI | Description
 --- | ---- | -----------
-`ADOP` | adoption<br/>`g7.1:ADOP` | Creation of a legally approved child-parent relationship that does not exist biologically.
-`BAPM` | baptism<br/>`g7.1:BAPM` | Baptism, performed in infancy or later. (See also [`BAPL`](#latter-day-saint-ordinances) and `CHR`.)
-`BARM` | Bar Mitzvah<br/>`g7.1:BARM` | The ceremonial event held when a Jewish boy reaches age 13.
-`BASM` | Bas Mitzvah<br/>`g7.1:BASM` | The ceremonial event held when a Jewish girl reaches age 13, also known as "Bat Mitzvah."
-`BIRT` | birth<br/>`g7.1:BIRT` | Entering into life.
-`BLES` | blessing<br/>`g7.1:BLES` | Bestowing divine care or intercession. Sometimes given in connection with a naming ceremony.
-`BURI` | depositing remains<br/>`g7.1:BURI` | Depositing the mortal remains of a deceased person.
-`CENS` | census<br/>`g7.1:INDI-CENS` | Periodic count of the population for a designated locality, such as a national or state census.
-`CHR` | christening<br/>`g7.1:CHR` | Baptism or naming events for a child.
-`CHRA` | adult christening<br/>`g7.1:CHRA` | Baptism or naming events for an adult person.
-`CONF` | confirmation<br/>`g7.1:CONF` | Conferring full church membership.
-`CREM` | cremation<br/>`g7.1:CREM` | The act of reducing a dead body to ashes by fire.
-`DEAT` | death<br/>`g7.1:DEAT` | Mortal life terminates.
-`EMIG` | emigration<br/>`g7.1:EMIG` | Leaving one's homeland with the intent of residing elsewhere.
-`FCOM` | first communion<br/>`g7.1:FCOM` | The first act of sharing in the Lord's supper as part of church worship.
-`GRAD` | graduation<br/>`g7.1:GRAD` | Awarding educational diplomas or degrees to individuals.
-`IMMI` | immigration<br/>`g7.1:IMMI` | Entering into a new locality with the intent of residing there.
-`NATU` | naturalization<br/>`g7.1:NATU` | Obtaining citizenship.
-`ORDN` | ordination<br/>`g7.1:ORDN` | Receiving authority to act in religious matters.
-`PROB` | probate<br/>`g7.1:PROB` | Judicial determination of the validity of a will. It may indicate several related court activities over several dates.
-`RETI` | retirement<br/>`g7.1:RETI` | Exiting an occupational relationship with an employer after a qualifying time period.
-`WILL` | will<br/>`g7.1:WILL` | A legal document treated as an event, by which a person disposes of his or her estate. It takes effect after death. The event date is the date the will was signed while the person was alive. (See also `PROB`)
+`ADOP` | adoption<br/>`g7:ADOP` | Creation of a legally approved child-parent relationship that does not exist biologically.
+`BAPM` | baptism<br/>`g7:BAPM` | Baptism, performed in infancy or later. (See also [`BAPL`](#latter-day-saint-ordinances) and `CHR`.)
+`BARM` | Bar Mitzvah<br/>`g7:BARM` | The ceremonial event held when a Jewish boy reaches age 13.
+`BASM` | Bas Mitzvah<br/>`g7:BASM` | The ceremonial event held when a Jewish girl reaches age 13, also known as "Bat Mitzvah."
+`BIRT` | birth<br/>`g7:BIRT` | Entering into life.
+`BLES` | blessing<br/>`g7:BLES` | Bestowing divine care or intercession. Sometimes given in connection with a naming ceremony.
+`BURI` | depositing remains<br/>`g7:BURI` | Depositing the mortal remains of a deceased person.
+`CENS` | census<br/>`g7:INDI-CENS` | Periodic count of the population for a designated locality, such as a national or state census.
+`CHR` | christening<br/>`g7:CHR` | Baptism or naming events for a child.
+`CHRA` | adult christening<br/>`g7:CHRA` | Baptism or naming events for an adult person.
+`CONF` | confirmation<br/>`g7:CONF` | Conferring full church membership.
+`CREM` | cremation<br/>`g7:CREM` | The act of reducing a dead body to ashes by fire.
+`DEAT` | death<br/>`g7:DEAT` | Mortal life terminates.
+`EMIG` | emigration<br/>`g7:EMIG` | Leaving one's homeland with the intent of residing elsewhere.
+`FCOM` | first communion<br/>`g7:FCOM` | The first act of sharing in the Lord's supper as part of church worship.
+`GRAD` | graduation<br/>`g7:GRAD` | Awarding educational diplomas or degrees to individuals.
+`IMMI` | immigration<br/>`g7:IMMI` | Entering into a new locality with the intent of residing there.
+`NATU` | naturalization<br/>`g7:NATU` | Obtaining citizenship.
+`ORDN` | ordination<br/>`g7:ORDN` | Receiving authority to act in religious matters.
+`PROB` | probate<br/>`g7:PROB` | Judicial determination of the validity of a will. It may indicate several related court activities over several dates.
+`RETI` | retirement<br/>`g7:RETI` | Exiting an occupational relationship with an employer after a qualifying time period.
+`WILL` | will<br/>`g7:WILL` | A legal document treated as an event, by which a person disposes of his or her estate. It takes effect after death. The event date is the date the will was signed while the person was alive. (See also `PROB`)
 
 In addition, `INDI`.`EVEN` is a structure for a generic individual event. It must have a `TYPE` substructure to define what kind of event is being provided.
 
@@ -102,16 +102,16 @@ In addition, `INDI`.`EVEN` is a structure for a generic individual event. It mus
 
 Tag | Name<br/>URI | Description
 --- | ---- | -----------
-`ANUL` | annulment<br/>`g7.1:ANUL` | Declaring a marriage void from the beginning (never existed).
-`CENS` | census<br/>`g7.1:FAM-CENS` | Periodic count of the population for a designated locality, such as a national or state census.
-`DIV` | divorce<br/>`g7.1:DIV` | Dissolving a marriage through civil action.
-`DIVF` | divorce filed<br/>`g7.1:DIVF` | Filing for a divorce by a spouse.
-`ENGA` | engagement<br/>`g7.1:ENGA` | Recording or announcing an agreement between 2 people to become married.
-`MARB` | marriage bann<br/>`g7.1:MARB` | Official public notice given that 2 people intend to marry.
-`MARC` | marriage contract<br/>`g7.1:MARC` | Recording a formal agreement of marriage, including the prenuptial agreement in which marriage partners reach agreement about the property rights of 1 or both, securing property to their children.
-`MARL` | marriage license<br/>`g7.1:MARL` | Obtaining a legal license to marry.
-`MARR` | marriage<br/>`g7.1:MARR` | A legal, common-law, or customary event such as a wedding or marriage ceremony that joins 2 partners to create or extend a family unit.
-`MARS` | marriage settlement<br/>`g7.1:MARS` | Creating an agreement between 2 people contemplating marriage, at which time they agree to release or modify property rights that would otherwise arise from the marriage.
+`ANUL` | annulment<br/>`g7:ANUL` | Declaring a marriage void from the beginning (never existed).
+`CENS` | census<br/>`g7:FAM-CENS` | Periodic count of the population for a designated locality, such as a national or state census.
+`DIV` | divorce<br/>`g7:DIV` | Dissolving a marriage through civil action.
+`DIVF` | divorce filed<br/>`g7:DIVF` | Filing for a divorce by a spouse.
+`ENGA` | engagement<br/>`g7:ENGA` | Recording or announcing an agreement between 2 people to become married.
+`MARB` | marriage bann<br/>`g7:MARB` | Official public notice given that 2 people intend to marry.
+`MARC` | marriage contract<br/>`g7:MARC` | Recording a formal agreement of marriage, including the prenuptial agreement in which marriage partners reach agreement about the property rights of 1 or both, securing property to their children.
+`MARL` | marriage license<br/>`g7:MARL` | Obtaining a legal license to marry.
+`MARR` | marriage<br/>`g7:MARR` | A legal, common-law, or customary event such as a wedding or marriage ceremony that joins 2 partners to create or extend a family unit.
+`MARS` | marriage settlement<br/>`g7:MARS` | Creating an agreement between 2 people contemplating marriage, at which time they agree to release or modify property rights that would otherwise arise from the marriage.
 
 In addition, `FAM`.`EVEN` is a structure for a generic family event. It must have a `TYPE` substructure to define what kind of event is being provided.
 
@@ -124,19 +124,19 @@ Unlike events, the presence of an attribute is sufficient to assert the attribut
 
 Tag | Name<br/>URI | Description
 --- | ---- | -----------
-`CAST` | caste<br/>`g7.1:CAST` | The name of an individual's rank or status in society which is sometimes based on racial or religious differences, or differences in wealth, inherited rank, profession, or occupation.
-`DSCR` | physical description<br/>`g7.1:DSCR` | The physical characteristics of a person.
-`EDUC` | education<br/>`g7.1:EDUC` | Indicator of a level of education attained.
-`IDNO` | identifying number<br/>`g7.1:IDNO` | A number or other string assigned to identify a person within some significant external system. It must have a `TYPE` substructure to define what kind of identification number is being provided.
-`NATI` | nationality<br/>`g7.1:NATI` | An individual's national heritage or origin, or other folk, house, kindred, lineage, or tribal interest.
-`NCHI` | number of children<br/>`g7.1:INDI-NCHI` | The number of children that this person is known to be the parent of (all marriages).
-`NMR` | number of marriages<br/>`g7.1:NMR` | The number of times this person has participated in a family as a spouse or parent.
-`OCCU` | occupation<br/>`g7.1:OCCU` | The type of work or profession of an individual.
-`PROP` | property<br/>`g7.1:PROP` | Pertaining to possessions such as real estate or other property of interest.
-`RELI` | religion<br/>`g7.1:INDI-RELI` | A religious denomination to which a person is affiliated or for which a record applies.
-`RESI` | residence<br/>`g7.1:INDI-RESI` | An address or place of residence where an individual resided.
-`SSN` | social security number<br/>`g7.1:SSN` | A number assigned by the United States Social Security Administration, used for tax identification purposes. It is a type of `IDNO`.
-`TITL` | title<br/>`g7.1:INDI-TITL` | A formal designation used by an individual in connection with positions of royalty or other social status, such as Grand Duke.
+`CAST` | caste<br/>`g7:CAST` | The name of an individual's rank or status in society which is sometimes based on racial or religious differences, or differences in wealth, inherited rank, profession, or occupation.
+`DSCR` | physical description<br/>`g7:DSCR` | The physical characteristics of a person.
+`EDUC` | education<br/>`g7:EDUC` | Indicator of a level of education attained.
+`IDNO` | identifying number<br/>`g7:IDNO` | A number or other string assigned to identify a person within some significant external system. It must have a `TYPE` substructure to define what kind of identification number is being provided.
+`NATI` | nationality<br/>`g7:NATI` | An individual's national heritage or origin, or other folk, house, kindred, lineage, or tribal interest.
+`NCHI` | number of children<br/>`g7:INDI-NCHI` | The number of children that this person is known to be the parent of (all marriages).
+`NMR` | number of marriages<br/>`g7:NMR` | The number of times this person has participated in a family as a spouse or parent.
+`OCCU` | occupation<br/>`g7:OCCU` | The type of work or profession of an individual.
+`PROP` | property<br/>`g7:PROP` | Pertaining to possessions such as real estate or other property of interest.
+`RELI` | religion<br/>`g7:INDI-RELI` | A religious denomination to which a person is affiliated or for which a record applies.
+`RESI` | residence<br/>`g7:INDI-RESI` | An address or place of residence where an individual resided.
+`SSN` | social security number<br/>`g7:SSN` | A number assigned by the United States Social Security Administration, used for tax identification purposes. It is a type of `IDNO`.
+`TITL` | title<br/>`g7:INDI-TITL` | A formal designation used by an individual in connection with positions of royalty or other social status, such as Grand Duke.
 
 In addition, `INDI`.`FACT` is a structure for a generic individual attribute. It must have a `TYPE` substructure to define what kind of attribute is being provided.
 
@@ -144,8 +144,8 @@ In addition, `INDI`.`FACT` is a structure for a generic individual attribute. It
 
 Tag | Name<br/>URI | Description
 ----|--------------|-----------------
-`NCHI` | number of children<br/>`g7.1:FAM-NCHI` | The number of children that belong to this family.
-`RESI` | residence<br/>`g7.1:FAM-RESI` | An address or place of residence where a family resided.
+`NCHI` | number of children<br/>`g7:FAM-NCHI` | The number of children that belong to this family.
+`RESI` | residence<br/>`g7:FAM-RESI` | An address or place of residence where a family resided.
 
 In addition, `FAM`.`FACT` is a structure for a generic family attribute. It must have a `TYPE` substructure to define what kind of attribute is being provided.
 
@@ -162,12 +162,12 @@ This is no longer the case, but when it was the case the following principles he
 
 Tag | Name<br/>URI | Description
 ----|------|-----------------
-`BAPL` | baptism<br/>`g7.1:BAPL` | The event of baptism performed at age 8 or later by priesthood authority of The Church of Jesus Christ of Latter-day Saints. (See also [`BAPM`](#individual-events))
-`CONL` | confirmation<br/>`g7.1:CONL` | The religious event by which a person receives membership in The Church of Jesus Christ of Latter-day Saints. (See also [`CONF`](#individual-events))
-`INIL` | initiatory<br/>`g7.1:INIL` | A religious event where an initiatory ordinance for an individual was performed by priesthood authority in a temple of The Church of Jesus Christ of Latter-day Saints.
-`ENDL` | endowment<br/>`g7.1:ENDL` | A religious event where an endowment ordinance for an individual was performed by priesthood authority in a temple of The Church of Jesus Christ of Latter-day Saints.
-`SLGC` | sealing child<br/>`g7.1:SLGC` | A religious event pertaining to the sealing of a child to his or her parents in a temple ceremony of The Church of Jesus Christ of Latter-day Saints.
-`SLGS` | sealing spouse<br/>`g7.1:SLGS` | A religious event pertaining to the sealing of a husband and wife in a temple ceremony of The Church of Jesus Christ of Latter-day Saints. (See also [`MARR`](#family-events))
+`BAPL` | baptism<br/>`g7:BAPL` | The event of baptism performed at age 8 or later by priesthood authority of The Church of Jesus Christ of Latter-day Saints. (See also [`BAPM`](#individual-events))
+`CONL` | confirmation<br/>`g7:CONL` | The religious event by which a person receives membership in The Church of Jesus Christ of Latter-day Saints. (See also [`CONF`](#individual-events))
+`INIL` | initiatory<br/>`g7:INIL` | A religious event where an initiatory ordinance for an individual was performed by priesthood authority in a temple of The Church of Jesus Christ of Latter-day Saints.
+`ENDL` | endowment<br/>`g7:ENDL` | A religious event where an endowment ordinance for an individual was performed by priesthood authority in a temple of The Church of Jesus Christ of Latter-day Saints.
+`SLGC` | sealing child<br/>`g7:SLGC` | A religious event pertaining to the sealing of a child to his or her parents in a temple ceremony of The Church of Jesus Christ of Latter-day Saints.
+`SLGS` | sealing spouse<br/>`g7:SLGS` | A religious event pertaining to the sealing of a husband and wife in a temple ceremony of The Church of Jesus Christ of Latter-day Saints. (See also [`MARR`](#family-events))
 
 
 
@@ -185,7 +185,7 @@ A short name of a title, description, or name used for sorting, filing, and retr
 The location of, or most relevant to, the subject of the superstructure.
 See `ADDRESS_STRUCTURE` for more details.
 
-#### `ADOP` (Adoption) `g7.1:ADOP`
+#### `ADOP` (Adoption) `g7:ADOP`
 
 An [Individual Event](#individual-events).
 See also `INDIVIDUAL_EVENT_STRUCTURE`.
@@ -233,7 +233,7 @@ The age of the individual at the time an event occurred. It is recommended that
 The organization, institution, corporation, person, or other entity that has responsibility for the associated context.
 Examples are an employer of a person of an associated occupation, or a church that administered rites or events, or an organization responsible for creating or archiving records.
 
-#### `ALIA` (Alias) `g7.1:ALIA`
+#### `ALIA` (Alias) `g7:ALIA`
 
 A single individual may have facts distributed across multiple individual records, connected by `ALIA` pointers
 (named after "alias" in the computing sense, not the pseudonym sense).
@@ -254,17 +254,17 @@ Applications should avoid assuming a particular usage was intended without user
 A future version of this specification may adjust the definition of `ALIA`.
 :::
 
-#### `ANCI` (Ancestor interest) `g7.1:ANCI`
+#### `ANCI` (Ancestor interest) `g7:ANCI`
 
 Indicates an interest in additional research for ancestors of this individual.
 (See also `DESI`).
 
-#### `ANUL` (Annulment) `g7.1:ANUL`
+#### `ANUL` (Annulment) `g7:ANUL`
 
 A [Family Event](#family-events).
 See also `FAMILY_EVENT_STRUCTURE`.
 
-#### `ASSO` (Associates) `g7.1:ASSO`
+#### `ASSO` (Associates) `g7:ASSO`
 
 A pointer to an associated individual.
 See `ASSOCIATION_STRUCTURE` for more details.
@@ -273,37 +273,37 @@ See `ASSOCIATION_STRUCTURE` for more details.
 
 The person, agency, or entity who created the record. For a published work, this could be the author, compiler, transcriber, abstractor, or editor. For an unpublished source, this may be an individual, a government agency, church organization, or private organization.
 
-#### `BAPL` (Baptism, Latter-Day Saint) `g7.1:BAPL`
+#### `BAPL` (Baptism, Latter-day Saint) `g7:BAPL`
 
-A [Latter-Day Saint Ordinance](#latter-day-saint-ordinances).
+A [Latter-day Saint Ordinance](#latter-day-saint-ordinances).
 See also `LDS_INDIVIDUAL_ORDINANCE`.
 
-#### `BAPM` (Baptism) `g7.1:BAPM`
+#### `BAPM` (Baptism) `g7:BAPM`
 
 An [Individual Event](#individual-events).
 See also `INDIVIDUAL_EVENT_STRUCTURE`.
 
-#### `BARM` (Bar Mitzvah) `g7.1:BARM`
+#### `BARM` (Bar Mitzvah) `g7:BARM`
 
 An [Individual Event](#individual-events).
 See also `INDIVIDUAL_EVENT_STRUCTURE`.
 
-#### `BASM` (Bas Mitzvah) `g7.1:BASM`
+#### `BASM` (Bas Mitzvah) `g7:BASM`
 
 An [Individual Event](#individual-events).
 See also `INDIVIDUAL_EVENT_STRUCTURE`.
 
-#### `BIRT` (Birth) `g7.1:BIRT`
+#### `BIRT` (Birth) `g7:BIRT`
 
 An [Individual Event](#individual-events).
 See also `INDIVIDUAL_EVENT_STRUCTURE`.
 
-#### `BLES` (Blessing) `g7.1:BLES`
+#### `BLES` (Blessing) `g7:BLES`
 
 An [Individual Event](#individual-events).
 See also `INDIVIDUAL_EVENT_STRUCTURE`.
 
-#### `BURI` (Depositing remains) `g7.1:BURI`
+#### `BURI` (Depositing remains) `g7:BURI`
 
 An [Individual Event](#individual-events).
 See also `INDIVIDUAL_EVENT_STRUCTURE`.
@@ -316,7 +316,7 @@ In the absence of a clarifying `TYPE` substructure it is likely, but not guarant
 An identification or reference description used to file and retrieve items from the holdings of a repository.
 Despite the word "number" in the name, may contain any character, not just digits.
 
-#### `CAST` (Caste)  `g7.1:CAST`
+#### `CAST` (Caste)  `g7:CAST`
 
 An [Individual Attribute](#individual-attributes).
 See also `INDIVIDUAL_ATTRIBUTE_STRUCTURE`.
@@ -326,31 +326,31 @@ See also `INDIVIDUAL_ATTRIBUTE_STRUCTURE`.
 The reasons which precipitated an event.
 It is often used subordinate to a death event to show cause of death, such as might be listed on a death certificate.
 
-#### `CENS` (Census)  `g7.1:FAM-CENS`
+#### `CENS` (Census)  `g7:FAM-CENS`
 
-An [Family Event](#family-events).
+A [Family Event](#family-events).
 
-#### `CENS` (Census)  `g7.1:INDI-CENS`
+#### `CENS` (Census)  `g7:INDI-CENS`
 
 An [Individual Event](#individual-events).
 See also `INDIVIDUAL_EVENT_STRUCTURE`.
 
-#### `CHAN` (Change) `g7.1:CHAN`
+#### `CHAN` (Change) `g7:CHAN`
 
 The most recent change to the superstructure.
 This is metadata about the structure itself, not data about its subject.
 See `CHANGE_DATE` for more details.
 
-#### `CHIL` (Child) `g7.1:CHIL`
+#### `CHIL` (Child) `g7:CHIL`
 
 The child in a family, whether biological, adopted, foster, sealed, or other relationship.
 
-#### `CHRA` (Christening, adult)  `g7.1:CHRA`
+#### `CHRA` (Christening, adult)  `g7:CHRA`
 
 An [Individual Event](#individual-events).
 See also `INDIVIDUAL_EVENT_STRUCTURE`.
 
-#### `CHR` (Christening)  `g7.1:CHR`
+#### `CHR` (Christening)  `g7:CHR`
 
 An [Individual Event](#individual-events).
 See also `INDIVIDUAL_EVENT_STRUCTURE`.
@@ -360,14 +360,14 @@ See also `INDIVIDUAL_EVENT_STRUCTURE`.
 The name of the city used in the address.
 See `ADDRESS_STRUCTURE` for more details.
 
-#### `CONF` (Confirmation)  `g7.1:CONF`
+#### `CONF` (Confirmation)  `g7:CONF`
 
 An [Individual Event](#individual-events).
 See also `INDIVIDUAL_EVENT_STRUCTURE`.
 
-#### `CONL` (Confirmation, Latter-Day Saint) `g7.1:CONL`
+#### `CONL` (Confirmation, Latter-day Saint) `g7:CONL`
 
-A [Latter-Day Saint Ordinance](#latter-day-saint-ordinances).
+A [Latter-day Saint Ordinance](#latter-day-saint-ordinances).
 See also `LDS_INDIVIDUAL_ORDINANCE`.
 
 #### `CONT` (Continued) `g7:CONT`
@@ -390,7 +390,7 @@ The initial creation of the superstructure.
 This is metadata about the structure itself, not data about its subject.
 See `CREATION_DATE` for more details.
 
-#### `CREM` (Cremation)  `g7.1:CREM`
+#### `CREM` (Cremation)  `g7:CREM`
 
 An [Individual Event](#individual-events).
 See also `INDIVIDUAL_EVENT_STRUCTURE`.
@@ -425,7 +425,7 @@ The following are errors:
 The name of the country that pertains to the associated address.
 See `ADDRESS_STRUCTURE` for more details.
 
-#### `DATA` (Data) `g7.1:DATA`
+#### `DATA` (Data) `g7:DATA`
 
 A structure with no payload used to distinguish a description of something from metadata about it.
 For example, `SOUR` and its other substructures describe a source itself,
@@ -433,7 +433,7 @@ while `SOUR`.`DATA` describes the content of the source.
 
 #### `DATA` (Data) `g7:SOUR-DATA`
 
-See `g7.1:DATA`.
+See `g7:DATA`.
 
 #### `DATA` (Data) `g7:HEAD-SOUR-DATA`
 
@@ -476,16 +476,12 @@ The `DatePeriod` during which the event did not occur or the attribute did not a
 
 The `DatePeriod` covered by the entire source; the period during which this source recorded events.
 
-#### `DEAT` (Death) `g7.1:DEAT`
+#### `DEAT` (Death) `g7:DEAT`
 
 An [Individual Event](#individual-events).
 See also `INDIVIDUAL_EVENT_STRUCTURE`.
 
-#### `DESC` (Description) `g7.1:HEAD-DESC`
-
-A description of the entire dataset.
-
-#### `DESI` (Descendant Interest) `g7.1:DESI`
+#### `DESI` (Descendant Interest) `g7:DESI`
 
 Indicates an interest in research to identify additional descendants of this individual.
 See also `ANCI`.
@@ -495,22 +491,22 @@ See also `ANCI`.
 An identifier for the system expected to receive this document.
 See `HEAD`.`SOUR` for guidance on choosing identifiers.
 
-#### `DIVF` (Divorce filing) `g7.1:DIVF`
+#### `DIVF` (Divorce filing) `g7:DIVF`
 
 A [Family Event](#family-events).
 See also `FAMILY_EVENT_STRUCTURE`.
 
-#### `DIV` (Divorce) `g7.1:DIV`
+#### `DIV` (Divorce) `g7:DIV`
 
 A [Family Event](#family-events).
 See also `FAMILY_EVENT_STRUCTURE`.
 
-#### `DSCR` (Description) `g7.1:DSCR`
+#### `DSCR` (Description) `g7:DSCR`
 
 An [Individual Attribute](#individual-attributes).
 See also `INDIVIDUAL_ATTRIBUTE_STRUCTURE`.
 
-#### `EDUC` (Education) `g7.1:EDUC`
+#### `EDUC` (Education) `g7:EDUC`
 
 An [Individual Attribute](#individual-attributes).
 See also `INDIVIDUAL_ATTRIBUTE_STRUCTURE`.
@@ -526,26 +522,26 @@ If an invalid email address is present upon import, it should be preserved as-is
 The version 5.5.1 specification contained a typo where this tag was sometimes written `EMAI` and sometimes written `EMAIL`. `EMAIL` should be used in version 7.0 and later.
 :::
 
-#### `EMIG` (Emigration) `g7.1:EMIG`
+#### `EMIG` (Emigration) `g7:EMIG`
 
 An [Individual Event](#individual-events).
 See also `INDIVIDUAL_EVENT_STRUCTURE`.
 
-#### `ENDL` (Endowment, Latter-Day Saint) `g7.1:ENDL`
+#### `ENDL` (Endowment, Latter-day Saint) `g7:ENDL`
 
-A [Latter-Day Saint Ordinance](#latter-day-saint-ordinances).
+A [Latter-day Saint Ordinance](#latter-day-saint-ordinances).
 See also `LDS_INDIVIDUAL_ORDINANCE`.
 
-#### `ENGA` (Engagement) `g7.1:ENGA`
+#### `ENGA` (Engagement) `g7:ENGA`
 
 A [Family Event](#family-events).
 See also `FAMILY_EVENT_STRUCTURE`.
 
-#### `EVEN` (Event) `g7.1:FAM-EVEN`
+#### `EVEN` (Event) `g7:FAM-EVEN`
 
-See `g7.1:INDI-EVEN`.
+See `g7:INDI-EVEN`.
 
-#### `EVEN` (Event) `g7.1:INDI-EVEN`
+#### `EVEN` (Event) `g7:INDI-EVEN`
 
 An event: a noteworthy happening related to an individual or family.
 If a specific event type exists, it should be used instead of a generic `EVEN` structure.
@@ -566,15 +562,15 @@ A person that signed a lease for land dated October 2, 1837 and a lease for mini
 ```
 :::
 
-#### `EVEN` (Event) `g7.1:DATA-EVEN`
+#### `EVEN` (Event) `g7:DATA-EVEN`
 
-A list of enumerated values from set `g7.1:enumset-EVENATTR` indicating the types of events that were recorded in a particular source.
+A list of enumerated values from set `g7:enumset-EVENATTR` indicating the types of events that were recorded in a particular source.
 Each event type is separated by a comma and space.
 For example, a parish register of births, deaths, and marriages would be `BIRT, DEAT, MARR`.
 
-#### `EVEN` (Event) `g7.1:SOUR-EVEN`
+#### `EVEN` (Event) `g7:SOUR-EVEN`
 
-An enumerated value from set `g7.1:enumset-EVENATTR` indicating the type of event or attribute which was responsible for the source entry being recorded.
+An enumerated value from set `g7:enumset-EVENATTR` indicating the type of event or attribute which was responsible for the source entry being recorded.
 For example, if the entry was created to record a birth of a child, then the type would be `BIRT` regardless of the assertions made from that record, such as the mother's name or mother's birth date.
 
 #### `EXID` (External Identifier) `g7:EXID`
@@ -587,7 +583,7 @@ Depending on the maintaining authority, an `EXID` may be a unique identifier for
 
 `EXID` identifiers are expected to be unique. Once assigned, an `EXID` identifier should never be re-used for any other purpose.
 
-#### `FAM` (Family record) `g7.1:record-FAM`
+#### `FAM` (Family record) `g7:record-FAM`
 
 See `FAMILY_RECORD`
 
@@ -607,11 +603,11 @@ Implementers should support both representations,
 and should choose between them based on user input or other context beyond that provided in the datasets themselves.
 :::
 
-#### `FACT` (Fact) `g7.1:FAM-FACT`
+#### `FACT` (Fact) `g7:FAM-FACT`
 
-See `g7.1:INDI-FACT`.
+See `g7:INDI-FACT`.
 
-#### `FACT` (Fact) `g7.1:INDI-FACT`
+#### `FACT` (Fact) `g7:INDI-FACT`
 
 A noteworthy attribute or fact concerning an individual or family.
 If a specific attribute type exists, it should be used instead of a generic `FACT` structure.
@@ -628,23 +624,23 @@ If the attribute being defined was 1 of the person's skills, such as woodworking
 ```
 :::
 
-#### `FAMC` (Family child) `g7.1:INDI-FAMC`
+#### `FAMC` (Family child) `g7:INDI-FAMC`
 
 The family in which an individual appears as a child.
 It is also used with a `g7:FAMC-STAT` substructure to show individuals who are not children of the family.
 See `FAMILY_RECORD` for more details.
 
-#### `FAMC` (Family child) `g7.1:FAMC`
+#### `FAMC` (Family child) `g7:FAMC`
 
 The family with which this individual event is associated.
 
-#### `FAMC` (Family child) `g7.1:ADOP-FAMC`
+#### `FAMC` (Family child) `g7:ADOP-FAMC`
 
 The individual or couple that adopted this individual.
 
 Adoption by an individual, rather than a couple, may be represented either by pointing to a `FAM` where that individual is a `HUSB` or `WIFE` and using a `g7:FAMC-ADOP` substructure to indicate which 1 performed the adoption; or by using a `FAM` where the adopting individual is the only `HUSB`/`WIFE`.
 
-#### `FAMS` (Family spouse) `g7.1:FAMS`
+#### `FAMS` (Family spouse) `g7:FAMS`
 
 The family in which an individual appears as a partner.
 See `FAMILY_RECORD` for more details.
@@ -654,7 +650,7 @@ See `FAMILY_RECORD` for more details.
 A fax telephone number appropriate for sending data facsimiles.
 See `PHON` for additional comments on telephone numbers.
 
-#### `FCOM` (First communion) `g7.1:FCOM`
+#### `FCOM` (First communion) `g7:FCOM`
 
 An [Individual Event](#individual-events).
 See also `INDIVIDUAL_EVENT_STRUCTURE`.
@@ -664,6 +660,32 @@ See also `INDIVIDUAL_EVENT_STRUCTURE`.
 A reference to an external file.
 See the [File Path datatype](#file-path) for more details.
 
+External files may contain embedded metadata,
+which may be of value to family history work.
+Applications should not remove or edit metadata except as requested by the user.
+Applications are encouraged to show the metadata in referenced external files to the user
+and provide ways of integrating that metadata into appropriate structures with user guidance.
+
+:::note
+Conversion between file metadata and GEDCOM structures generally requires user input, as the mapping is often content-dependent.
+For example, if `image.jpg` has a `dc:title` field and is used in the following way
+
+```gedcom
+0 @I1@ INDI
+1 SOUR @S1@
+0 @S1@ SOUR
+1 OBJE @O1@
+0 @O1@ OBJE
+1 FILE image.jpg
+```
+
+that field might belong in a `NAME` of `@I1@`, or a `TITL` in `@S1@`, or a `NOTE` in `@O1@`, or possible other locations depending on what the field contains.
+:::
+
+:::note
+Information about embedded metadata of interest to family history can be found at <https://www.familysearch.org/innovate/photo-metadata>.
+:::
+
 #### `FORM` (Format) `g7:FORM`
 
 The [media type](#media-type) of the file referenced by the superstructure.
@@ -697,12 +719,12 @@ It is recommended that applications write `GEDC` with its required substructure
 
 A given or earned name used for official identification of a person.
 
-#### `GRAD` (Graduation) `g7.1:GRAD`
+#### `GRAD` (Graduation) `g7:GRAD`
 
 An [Individual Event](#individual-events).
 See also `INDIVIDUAL_EVENT_STRUCTURE`.
 
-#### `HEAD` (Header) `g7.1:HEAD`
+#### `HEAD` (Header) `g7:HEAD`
 
 A pseudo-structure for storing metadata about the document.
 See [The Header and Trailer](#the-header) for more details.
@@ -728,8 +750,8 @@ The correct tag for the height of an individual is the `DSCR` attribute.
 
 A structure for storing information related to one partner in the context of a `FAMILY_EVENT`;
 in particular,
-the partner referenced in the `g7.1:FAM-HUSB` substructure
-of the `g7.1:record-FAM` superstructure of the `FAMILY_EVENT`.
+the partner referenced in the `g7:FAM-HUSB` substructure
+of the `g7:record-FAM` superstructure of the `FAMILY_EVENT`.
 
 :::example
 The following indicates that individual `@I1@` was 32 years old at the time of the marriage, without indicating an age for individual `@I2@`.
@@ -744,49 +766,31 @@ The following indicates that individual `@I1@` was 32 years old at the time of t
 ```
 :::
 
-#### `HUSB` (Husband) `g7.1:FAM-HUSB`
+#### `HUSB` (Husband) `g7:FAM-HUSB`
 
 This is a partner in a `FAM` record.
 See `FAMILY_RECORD` for more details.
 
-#### `IDNO` (Identification number) `g7.1:IDNO`
+#### `IDNO` (Identification number) `g7:IDNO`
 
 An [Individual Attribute](#individual-attributes).
 See also `INDIVIDUAL_ATTRIBUTE_STRUCTURE`.
 
-#### `IMMI` (Immigration) `g7.1:IMMI`
+#### `IMMI` (Immigration) `g7:IMMI`
 
 An [Individual Event](#individual-events).
 See also `INDIVIDUAL_EVENT_STRUCTURE`.
 
-#### `INDI` (Individual) `g7.1:record-INDI`
+#### `INDI` (Individual) `g7:record-INDI`
 
 See `INDIVIDUAL_RECORD`.
 
-#### `INIL` (Initiatory, Latter-Day Saint) `g7.1:INIL`
+#### `INIL` (Initiatory, Latter-day Saint) `g7:INIL`
 
-A [Latter-Day Saint Ordinance](#latter-day-saint-ordinances).
+A [Latter-day Saint Ordinance](#latter-day-saint-ordinances).
 See also `LDS_INDIVIDUAL_ORDINANCE`.  Previously, GEDCOM versions 3.0 through 5.3 called this `WAC`; it was not part of 5.4 through 5.5.1.
 FamilySearch GEDCOM 7.0 reintroduced it with the name `INIL` for consistency with `BAPL`, `CONL`, and `ENDL`.
 
-#### `KIND` (Birth Kind) `g7.1:BIRT-KIND`
-
-An enumerated value from set `g7.1:enumset-BIRT-KIND` indicating the type of birth.
-
-There is some conceptual overlap between `BIRT`.`TYPE` and `BIRT`.`KIND`:
-
-- `BIRT`.`TYPE` is preferred for general-purpose human-readable information elaborating on the birth type.
-- `BIRT`.`KIND` is preferred for information that informs some programmatic behaviors
-    (such as creating a list of persons who were ever alive)
-    or to support automated translation into multiple languages.
-
-#### `KIND` (Type) `g7.1:NOTE-KIND`
-
-An enumerated value from set `g7.1:enumset-NOTE-KIND` indicating the type of the note.
-
-When there are multiple `g7.1:NOTE-KIND` substructures to a note, all apply equally to the note;
-there is no notion of a preferred or primary note type.
-
 #### `LANG` (Language) `g7:LANG`
 
 The primary human language of the superstructure.
@@ -881,27 +885,27 @@ neither a notion of accuracy
 nor a notion of region size
 (for example, the `MAP` for a place "Belarus" may be anywhere within that nation's 200,000 square kilometer area).
 
-#### `MARB` (Marriage banns) `g7.1:MARB`
+#### `MARB` (Marriage banns) `g7:MARB`
 
 A [Family Event](#family-events).
 See also `FAMILY_EVENT_STRUCTURE`.
 
-#### `MARC` (Marriage contract) `g7.1:MARC`
+#### `MARC` (Marriage contract) `g7:MARC`
 
 A [Family Event](#family-events).
 See also `FAMILY_EVENT_STRUCTURE`.
 
-#### `MARL` (Marriage license) `g7.1:MARL`
+#### `MARL` (Marriage license) `g7:MARL`
 
 A [Family Event](#family-events).
 See also `FAMILY_EVENT_STRUCTURE`.
 
-#### `MARR` (Marriage) `g7.1:MARR`
+#### `MARR` (Marriage) `g7:MARR`
 
 A [Family Event](#family-events).
 See also `FAMILY_EVENT_STRUCTURE`.
 
-#### `MARS` (Marriage settlement) `g7.1:MARS`
+#### `MARS` (Marriage settlement) `g7:MARS`
 
 A [Family Event](#family-events).
 See also `FAMILY_EVENT_STRUCTURE`.
@@ -928,7 +932,7 @@ for this asset, the `FORM`.`MEDI` is recommended to be `PHOTO` rather than `ELEC
 
 Indicates the [media type](#media-type) of the payload of the superstructure.
 
-As of version 7.1, three media types are supported by this structure:
+As of version 7.0, there are two standard media types for this structure:
 
 - `text/plain` shall be presented to the user as-is, preserving all spacing, line breaks, and so forth.
 
@@ -945,84 +949,58 @@ As of version 7.1, three media types are supported by this structure:
     Supporting more of HTML is encouraged.
     Unsupported tags should be ignored during display.
 
-    <div class="note">
-    Applications are welcome to support more XML entities or HTML character references in their user interface.
-    However, exporting must only use the core XML entities, translating any other entities into their corresponding Unicode characters.
-    </div>
-
-    <div class="note">
-    Applications are welcome to support additional HTML elements,
-    but they should ensure that content is meaningful if those extra elements are ignored and only their content text is displayed.
-    </div>
-
-    If needed, `text/html` can be converted to `text/plain` using the following steps:
-
-    1. Replace any sequence of 1 or more spaces, tabs, and line breaks with a single space
-    2. Case-insensitively replace each `<p`...`>`, `</p`...`>`, and `<br`...`>` with a line break
-    3. Remove all other `<`...`>` tags
-    4. Replace each `&lt;` with `<` and `&gt;` with `>`
-    5. Replace each `&amp;` with `&`
+:::note
+Applications are welcome to support more XML entities or HTML character references in their user interface.
+However, exporting must only use the core XML entities, translating any other entities into their corresponding Unicode characters.
+:::
 
-- `text/markdown` employs a plain text format for creating structured documents, and is designed
-    to be fairly understandable by users even if only displayed as plain text.
-    Applications should support the elements specified by [CommonMark](https://commonmark.org).
+:::note
+Applications are welcome to support additional HTML elements,
+but they should ensure that content is meaningful if those extra elements are ignored and only their content text is displayed.
+:::
 
-    For example:
 
-    <div class="example">
+:::note
+Media types are also used by external files, as described under `FORM`. External file media types are not limited to `text/plain` and `text/html`.
+:::
 
-    ````gedcom
-    1 NOTE # 1940 US Census for New York, New York
-    2 CONT __Individuals located at this address__
-    2 CONT * John **Doe** (age 35)
-    2 CONT * Sally (age 32)
-    2 CONT * Junior (age 3)
-    2 CONT * Betty (age 1)
-    2 MIME text/markdown
-    ````
-    
-    </div>
+If needed, `text/html` can be converted to `text/plain` using the following steps:
 
-    <div class="note">
-    Applications are welcome to support additional Markdown elements,
-    but they should ensure that content is meaningful if those extra elements are only displayed as plain text.
-    </div>
+1. Replace any sequence of 1 or more spaces, tabs, and line breaks with a single space
+2. Case-insensitively replace each `<p`...`>`, `</p`...`>`, and `<br`...`>` with a line break
+3. Remove all other `<`...`>` tags
+4. Replace each `&lt;` with `<` and `&gt;` with `>`
+5. Replace each `&amp;` with `&`
 
-:::note
 Other `text` media types not discussed above are also permitted, though not recommended.
 If present, they are considered extensions.  Such extensions do not require an
 [extension tag](#extensions) because the definition of `g7:MIME` is sufficient
 to cover this kind of extension.
-:::
-
-:::note
-Media types are also used by external files, as described under `FORM`. External file media types are not limited to `text` types.
-:::
 
 #### `NAME` (Name) `g7:NAME`
 
 The name of the superstructure's subject, represented as a simple string.
 
-#### `NAME` (Name) `g7.1:INDI-NAME`
+#### `NAME` (Name) `g7:INDI-NAME`
 
 A `PERSONAL_NAME_STRUCTURE` with parts, translations, sources, and so forth.
 
-#### `NATI` (Nationality) `g7.1:NATI`
+#### `NATI` (Nationality) `g7:NATI`
 
 An [Individual Attribute](#individual-attributes).
 See also `INDIVIDUAL_ATTRIBUTE_STRUCTURE`.
 
-#### `NATU` (Naturalization) `g7.1:NATU`
+#### `NATU` (Naturalization) `g7:NATU`
 
 An [Individual Event](#individual-events).
 See also `INDIVIDUAL_EVENT_STRUCTURE`.
 
-#### `NCHI` (Number of children) `g7.1:FAM-NCHI`
+#### `NCHI` (Number of children) `g7:FAM-NCHI`
 
 A [Family Attribute](#family-attributes).
 See also `FAMILY_ATTRIBUTE_STRUCTURE`.
 
-#### `NCHI` (Number of children) `g7.1:INDI-NCHI`
+#### `NCHI` (Number of children) `g7:INDI-NCHI`
 
 An [Individual Attribute](#individual-attributes).
 See also `INDIVIDUAL_ATTRIBUTE_STRUCTURE`.
@@ -1039,19 +1017,19 @@ Some use it for any variant of a name that is not the one used on legal document
 Because all of these uses, and likely others as well, are common in existing data, no further clarification of the meaning of the `NICK` structure is possible without contradicting some existing data.
 :::
 
-#### `NMR` (Number of marriages) `g7.1:NMR`
+#### `NMR` (Number of marriages) `g7:NMR`
 
 An [Individual Attribute](#individual-attributes).
 See also `INDIVIDUAL_ATTRIBUTE_STRUCTURE`.
 
-#### `NO` (Did not happen) `g7.1:NO`
+#### `NO` (Did not happen) `g7:NO`
 
-An enumerated value from set `g7.1:enumset-EVEN` identifying an event type which did not occur to the superstructure's subject.
+An enumerated value from set `g7:enumset-EVEN` identifying an event type which did not occur to the superstructure's subject.
 A specific payload `NO XYZ` should only appear where `XYZ` would be legal.
 
 See `NON_EVENT_STRUCTURE` for more details.
 
-#### `NOTE` (Note) `g7.1:NOTE`
+#### `NOTE` (Note) `g7:NOTE`
 
 A `NOTE_STRUCTURE`, containing additional information provided by the submitter for understanding the enclosing data.
 
@@ -1065,20 +1043,20 @@ Text that appears on a name line before the given and surname parts of a name.
 
 Text which appears on a name line after or behind the given and surname parts of a name.
 
-#### `OBJE` (Object) `g7.1:OBJE`
+#### `OBJE` (Object) `g7:OBJE`
 
 See `MULTIMEDIA_LINK`.
 
-#### `OBJE` (Object) `g7.1:record-OBJE`
+#### `OBJE` (Object) `g7:record-OBJE`
 
 See `MULTIMEDIA_RECORD`.
 
-#### `OCCU` (Occupation) `g7.1:OCCU`
+#### `OCCU` (Occupation) `g7:OCCU`
 
 An [Individual Attribute](#individual-attributes).
 See also `INDIVIDUAL_ATTRIBUTE_STRUCTURE`.
 
-#### `ORDN` (Ordination) `g7.1:ORDN`
+#### `ORDN` (Ordination) `g7:ORDN`
 
 An [Individual Event](#individual-events).
 See also `INDIVIDUAL_EVENT_STRUCTURE`.
@@ -1196,7 +1174,7 @@ A record specifying a writer's "pen name" (a type of professional name) might be
 :::
 
 
-#### `PLAC` (Place) `g7.1:PLAC`
+#### `PLAC` (Place) `g7:PLAC`
 
 The principal place in which the superstructure's subject occurred,
 represented as a [List] of jurisdictional entities in a sequence from the lowest to the highest jurisdiction,
@@ -1219,12 +1197,12 @@ This is a placeholder for providing a default `PLAC`.`FORM`, and must not have a
 A code used by a postal service to identify an area to facilitate mail handling.
 See `ADDRESS_STRUCTURE` for more details.
 
-#### `PROB` (Probate) `g7.1:PROB`
+#### `PROB` (Probate) `g7:PROB`
 
 An [Individual Event](#individual-events).
 See also `INDIVIDUAL_EVENT_STRUCTURE`.
 
-#### `PROP` (Property) `g7.1:PROP`
+#### `PROP` (Property) `g7:PROP`
 
 An [Individual Attribute](#individual-attributes).
 See also `INDIVIDUAL_ATTRIBUTE_STRUCTURE`.
@@ -1253,7 +1231,7 @@ Multiple structures describing different aspects of the same subject must not ha
 
 A religious denomination associated with the event or attribute described by the superstructure.
 
-#### `RELI` (Religion) `g7.1:INDI-RELI`
+#### `RELI` (Religion) `g7:INDI-RELI`
 
 An [Individual Attribute](#individual-attributes).
 See also `INDIVIDUAL_ATTRIBUTE_STRUCTURE`.
@@ -1268,23 +1246,23 @@ Such removal must abide by some constraints: see [Removing data](#removing-data)
 
 This is metadata about the structure itself, not data about its subject.
 
-#### `REPO` (Repository) `g7.1:REPO`
+#### `REPO` (Repository) `g7:REPO`
 
 See `SOURCE_REPOSITORY_CITATION`.
 
-#### `REPO` (Repository) `g7.1:record-REPO`
+#### `REPO` (Repository) `g7:record-REPO`
 
 See `REPOSITORY_RECORD`.
 
-#### `RESI` (Residence) `g7.1:FAM-RESI`
+#### `RESI` (Residence) `g7:FAM-RESI`
 
 A [Family Attribute](#family-attributes).
 See also `FAMILY_ATTRIBUTE_STRUCTURE`.
 
-See `g7.1:INDI-RESI` for comments on the use of payload strings in `RESI` structures.
+See `g7:INDI-RESI` for comments on the use of payload strings in `RESI` structures.
 
 
-#### `RESI` (Residence) `g7.1:INDI-RESI`
+#### `RESI` (Residence) `g7:INDI-RESI`
 
 An [Individual Attribute](#individual-attributes).
 See also `INDIVIDUAL_ATTRIBUTE_STRUCTURE`.
@@ -1307,7 +1285,7 @@ The following two examples show situations where a `RESI` payload may be appropr
 :::
 
 
-#### `RETI` (Retirement) `g7.1:RETI`
+#### `RETI` (Retirement) `g7:RETI`
 
 An [Individual Event](#individual-events).
 See also `INDIVIDUAL_EVENT_STRUCTURE`.
@@ -1367,32 +1345,32 @@ relative ordering of dates with different levels of precision is not well define
 
 An enumerated value from set `g7:enumset-SEX` that indicates the sex of the individual at birth.
 
-#### `SLGC` (Sealing, child) `g7.1:SLGC`
+#### `SLGC` (Sealing, child) `g7:SLGC`
 
-A [Latter-Day Saint Ordinance](#latter-day-saint-ordinances).
+A [Latter-day Saint Ordinance](#latter-day-saint-ordinances).
 See also `LDS_INDIVIDUAL_ORDINANCE`.
 
-#### `SLGS` (Sealing, spouse) `g7.1:SLGS`
+#### `SLGS` (Sealing, spouse) `g7:SLGS`
 
-A [Latter-Day Saint Ordinance](#latter-day-saint-ordinances).
+A [Latter-day Saint Ordinance](#latter-day-saint-ordinances).
 See also `LDS_SPOUSE_SEALING`.
 
-#### `SNOTE` (Shared note) `g7.1:SNOTE`
+#### `SNOTE` (Shared note) `g7:SNOTE`
 
 A pointer to a note that is shared by multiple structures.
 See `NOTE_STRUCTURE` for more details.
 
-#### `SNOTE` (Shared note) `g7.1:record-SNOTE`
+#### `SNOTE` (Shared note) `g7:record-SNOTE`
 
 A note that is shared by multiple structures.
 See `SHARED_NOTE_RECORD` for more details.
 
-#### `SOUR` (Source) `g7.1:SOUR`
+#### `SOUR` (Source) `g7:SOUR`
 
 A description of the relevant part of a source to support the superstructure's data.
 See `SOURCE_CITATION` for more details.
 
-#### `SOUR` (Source) `g7.1:record-SOUR`
+#### `SOUR` (Source) `g7:record-SOUR`
 
 A description of an entire source.
 See `SOURCE_RECORD` for more details.
@@ -1408,7 +1386,7 @@ Otherwise, a URI owned by the product should be used instead.
 
 A name piece used as a non-indexing pre-part of a surname.
 
-#### `SSN` (Social security number) `g7.1:SSN`
+#### `SSN` (Social security number) `g7:SSN`
 
 An [Individual Attribute](#individual-attributes).
 See also `INDIVIDUAL_ATTRIBUTE_STRUCTURE`.
@@ -1420,18 +1398,18 @@ See `ADDRESS_STRUCTURE` for more details.
 
 #### `STAT` (Status) `g7:ord-STAT`
 
-An enumerated value from set `g7:enumset-ord-STAT` assessing of the state or condition of an ordinance.
+An enumerated value from set `g7:enumset-ord-STAT` assessing the state or condition of an ordinance.
 
 #### `STAT` (Status) `g7:FAMC-STAT`
 
-An enumerated value from set `g7:enumset-FAMC-STAT` assessing of the state or condition of a researcher's belief in a family connection.
+An enumerated value from set `g7:enumset-FAMC-STAT` assessing the state or condition of a researcher's belief in a family connection.
 
-#### `SUBM` (Submitter) `g7.1:SUBM`
+#### `SUBM` (Submitter) `g7:SUBM`
 
 A contributor of information in the substructure.
 This is metadata about the structure itself, not data about its subject.
 
-#### `SUBM` (Submitter) `g7.1:record-SUBM`
+#### `SUBM` (Submitter) `g7:record-SUBM`
 
 A description of a contributor of information to the document.
 See `SUBMITTER_RECORD` for more details.
@@ -1482,11 +1460,7 @@ For an unpublished work, including most digital files, titles should be descript
 Some sources may have a citation text that cannot readily be represented using the `SOURCE_RECORD` substructures `AUTH`, `PUBL`, `REPO`, and so on.
 In such cases, the entire citation text may be presented as the payload of the `SOUR`.`TITL`.
 
-#### `TITL` (Title) `g7.1:HEAD-TITL`
-
-A descriptive title for the entire dataset.
-
-#### `TITL` (Title) `g7.1:INDI-TITL`
+#### `TITL` (Title) `g7:INDI-TITL`
 
 An [Individual Attribute](#individual-attributes).
 See also `INDIVIDUAL_ATTRIBUTE_STRUCTURE`.
@@ -1614,12 +1588,6 @@ not to translation to a different human language.
 Files that differ in the human language of their content
 should each be given their own `FILE` structure.
 
-#### `TRAN` (Translation) `g7.1:TEXT-TRAN`
-
-A type of `TRAN` for unstructured human-readable text without a media type,
-such as is found in `HEAD`.`DESC` and `HEAD`.`TITL` payloads.
-Each `g7:NOTE-TRAN` must have a `LANG` substructure.
-A superstructure of a `g7:TEXT-TRAN` should also have a `LANG` substructure.
 
 #### `TRLR` (Trailer) `g7:TRLR`
 
@@ -1661,6 +1629,10 @@ Other descriptor values might include, for example,
 See also `FACT` and `EVEN` for additional examples.
 :::
 
+#### `TYPE` (Type) `g7:NAME-TYPE`
+
+An enumerated value from set `g7:enumset-NAME-TYPE` indicating the type of the name.
+
 #### `TYPE` (Type) `g7:EXID-TYPE`
 
 The authority issuing the `EXID`, represented as a URI.
@@ -1675,10 +1647,6 @@ Registered URIs are listed in the [exid-types registry](https://github.com/Famil
 Additional type URIs can be registered by filing a
 [GitHub pull request](https://github.com/FamilySearch/GEDCOM-registries/pulls).
 
-#### `TYPE` (Type) `g7:NAME-TYPE`
-
-An enumerated value from set `g7:enumset-NAME-TYPE` indicating the type of the name.
-
 #### `UID` (Unique Identifier) `g7:UID`
 
 A globally-unique identifier of the superstructure,
@@ -1728,8 +1696,8 @@ See `CROP` for more details.
 
 A structure for storing information related to one partner in the context of a `FAMILY_EVENT`;
 in particular,
-the partner referenced in the `g7.1:FAM-WIFE` substructure
-of the `g7.1:record-FAM` superstructure of the `FAMILY_EVENT`.
+the partner referenced in the `g7:FAM-WIFE` substructure
+of the `g7:record-FAM` superstructure of the `FAMILY_EVENT`.
 
 :::example
 The following indicates that individual `@I2@` was 32 years old at the time of the marriage, without indicating an age for individual `@I1@`.
@@ -1744,12 +1712,12 @@ The following indicates that individual `@I2@` was 32 years old at the time of t
 ```
 :::
 
-#### `WIFE` (Wife) `g7.1:FAM-WIFE`
+#### `WIFE` (Wife) `g7:FAM-WIFE`
 
 A partner in a `FAM` record.
 See `FAMILY_RECORD` for more details.
 
-#### `WILL` (Will) `g7.1:WILL`
+#### `WILL` (Will) `g7:WILL`
 
 An [Individual Event](#individual-events).
 See also `INDIVIDUAL_EVENT_STRUCTURE`.
diff --git a/specification/gedcom-3-structures-4-enumerations.md b/specification/gedcom-3-structures-4-enumerations.md
index 0c930702..c3ef84dd 100644
--- a/specification/gedcom-3-structures-4-enumerations.md
+++ b/specification/gedcom-3-structures-4-enumerations.md
@@ -5,20 +5,13 @@ Each set of enumeration values has its own URI.
 
 ### `g7:enumset-ADOP`
 
-| Value | URI | Meaning |
-| :---- | :---| :------ |
+| Value  | URI                 | Meaning |
+| :----- | ------------------- | :------ |
 | `HUSB` | `g7:enum-ADOP-HUSB` | Adopted by the `HUSB` of the `FAM` pointed to by `FAMC` |
 | `WIFE` | `g7:enum-ADOP-WIFE` | Adopted by the `WIFE` of the `FAM` pointed to by `FAMC` |
-| `BOTH` | `g7:enum-BOTH` | Adopted by both `HUSB` and `WIFE` of the `FAM` pointed to by `FAMC` |
+| `BOTH` | `g7:enum-BOTH`      | Adopted by both `HUSB` and `WIFE` of the `FAM` pointed to by `FAMC` |
 
-### `g7.1:enumset-BIRT-KIND`
-
-| Value       | URI | Meaning |
-| :---------- | :---| :------ |
-| `BORN_DEAD` | `g7.1:enumset-BORN_DEAD` | Birth of a dead child; died before birth concluded (and possibly before it began), and was not thereafter revived. |
-| `BORN_LIVE` | `g7.1:enumset-BORN_LIVE` | Child was alive after birth. This is often seen as the default meaning of `BIRT`, but in some cases it might be ambiguous and adding `KIND BORN_LIVE` could be beneficial. |
-
-### `g7.1:enumset-EVEN`
+### `g7:enumset-EVEN`
 
 An event-type tag name, but not the generic `EVEN` tag.
 See [Events].
@@ -27,11 +20,11 @@ Most values in this enumeration set use the same tag and URI as the correspondin
 except for tags used with different URIs for `FAM` vs `INDI`:
 
 | Value  | URI            | Meaning                                                |
-| :----- | :------------- | :----------------------------------------------------- |
-| `CENS` | `g7.1:enum-CENS` | A census event; either `g7.1:INDI-CENS` or `g7.1:FAM-CENS` |
+| :----- | -------------- | :----------------------------------------------------- |
+| `CENS` | `g7:enum-CENS` | A census event; either `g7:INDI-CENS` or `g7:FAM-CENS` |
 
 
-### `g7.1:enumset-EVENATTR`
+### `g7:enumset-EVENATTR`
 
 An event- or attribute-type tag name.
 See [Events] and [Attributes].
@@ -40,51 +33,37 @@ Most values in this enumeration set use the same tag and URI as the correspondin
 except for tags used with different URIs for `FAM` vs `INDI`:
 
 | Value  | URI            | Meaning                                                |
-| :----- | :------------- | :----------------------------------------------------- |
-| `CENS` | `g7.1:enum-CENS` | A census event; either `g7.1:INDI-CENS` or `g7.1:FAM-CENS` |
-| `NCHI` | `g7.1:enum-NCHI` | A count of children; either `g7.1:INDI-NCHI` or `g7.1:FAM-NCHI` |
-| `RESI` | `g7.1:enum-RESI` | A residence attribute; either `g7.1:INDI-RESI` or `g7.1:FAM-RESI` |
-| `FACT` | `g7.1:enum-FACT` | A generic attribute; either `g7.1:INDI-FACT` or `g7.1:FAM-FACT` |
-| `EVEN` | `g7.1:enum-EVEN` | A generic event; either `g7.1:INDI-EVEN` or `g7.1:FAM-EVEN` |
+| :----- | -------------- | :----------------------------------------------------- |
+| `CENS` | `g7:enum-CENS` | A census event; either `g7:INDI-CENS` or `g7:FAM-CENS` |
+| `NCHI` | `g7:enum-NCHI` | A count of children; either `g7:INDI-NCHI` or `g7:FAM-NCHI` |
+| `RESI` | `g7:enum-RESI` | A residence attribute; either `g7:INDI-RESI` or `g7:FAM-RESI` |
+| `FACT` | `g7:enum-FACT` | A generic attribute; either `g7:INDI-FACT` or `g7:FAM-FACT` |
+| `EVEN` | `g7:enum-EVEN` | A generic event; either `g7:INDI-EVEN` or `g7:FAM-EVEN` |
 
 
 ### `g7:enumset-MEDI`
 
-| Value       | URI                 | Meaning                           |
-| :---------- | :------------------ | :-------------------------------- |
-| `AUDIO`     | `g7:enum-AUDIO`     | An audio recording                |
-| `BOOK`      | `g7:enum-BOOK`      | A bound book                      |
-| `CARD`      | `g7:enum-CARD`      | A card or file entry              |
-| `ELECTRONIC`| `g7:enum-ELECTRONIC`| A digital artifact such as a computer file or a scan |
-| `FICHE`     | `g7:enum-FICHE`     | Microfiche                        |
-| `FILM`      | `g7:enum-FILM`      | Microfilm                         |
-| `MAGAZINE`  | `g7:enum-MAGAZINE`  | Printed periodical                |
-| `MANUSCRIPT`| `g7:enum-MANUSCRIPT`| Written pages                     |
-| `MAP`       | `g7:enum-MAP`       | Cartographic map                  |
-| `NEWSPAPER` | `g7:enum-NEWSPAPER` | Printed newspaper                 |
-| `PHOTO`     | `g7:enum-PHOTO`     | Photograph                        |
-| `TOMBSTONE` | `g7:enum-TOMBSTONE` | Burial marker or related memorial |
-| `VIDEO`     | `g7:enum-VIDEO`     | Motion picture recording          |
-| `OTHER`     | `g7:enum-OTHER`     | A value not listed here; should have a `PHRASE` substructure |
-
-
-### `g7.1:enumset-NOTE-KIND`
-
-| Value         | URI                  | Meaning                           |
-| :------------ | :------------------- | :-------------------------------- |
-| `DATA`        | `g7.1:enum-DATA`     | Historical data that is not present in other structures |
-| `RESEARCH`    | `g7.1:enum-RESEARCH` | Notes about research performed |
-| `REASONING`   | `g7.1:enum-REASONING`| Descriptions of why the data is (or is not) believed to be accurate |
-| `SCOPE`       | `g7.1:enum-SCOPE`    | A description of what data is or should be included in the given dataset (if `HEAD`.`NOTE`), persona (if `INDI`.`NOTE`) or the like |
-| `STORY`       | `g7.1:enum-STORY`    | Text presenting a story about or history of the subject the note is attached to |
-| `TODO`        | `g7.1:enum-TODO`     | Notes about things the researcher wishes or hopes to do in the future |
-| `OTHER`       | `g7:enum-OTHER`      | A value not listed here; should have a `PHRASE` substructure |
-
+| Value        | URI                  | Meaning                           |
+| :----------- | -------------------- | :-------------------------------- |
+| `AUDIO`      | `g7:enum-AUDIO`      | An audio recording                |
+| `BOOK`       | `g7:enum-BOOK`       | A bound book                      |
+| `CARD`       | `g7:enum-CARD`       | A card or file entry              |
+| `ELECTRONIC` | `g7:enum-ELECTRONIC` | A digital artifact such as a computer file or a scan |
+| `FICHE`      | `g7:enum-FICHE`      | Microfiche                        |
+| `FILM`       | `g7:enum-FILM`       | Microfilm                         |
+| `MAGAZINE`   | `g7:enum-MAGAZINE`   | Printed periodical                |
+| `MANUSCRIPT` | `g7:enum-MANUSCRIPT` | Written pages                     |
+| `MAP`        | `g7:enum-MAP`        | Cartographic map                  |
+| `NEWSPAPER`  | `g7:enum-NEWSPAPER`  | Printed newspaper                 |
+| `PHOTO`      | `g7:enum-PHOTO`      | Photograph                        |
+| `TOMBSTONE`  | `g7:enum-TOMBSTONE`  | Burial marker or related memorial |
+| `VIDEO`      | `g7:enum-VIDEO`      | Motion picture recording          |
+| `OTHER`      | `g7:enum-OTHER`      | A value not listed here; should have a `PHRASE` substructure |
 
 ### `g7:enumset-PEDI`
 
 | Value     | URI               | Meaning                                                   |
-| :-------- | :---------------- | :-------------------------------------------------------- |
+| :-------- | ----------------- | :-------------------------------------------------------- |
 | `ADOPTED` | `g7:enum-ADOPTED` | Adoptive parents                                          |
 | `BIRTH`   | `g7:enum-BIRTH`   | Family structure at time of birth                         |
 | `FOSTER`  | `g7:enum-FOSTER`  | The child was included in a foster or guardian family     |
@@ -110,12 +89,12 @@ any associated `ADOP` event.
 
 ### `g7:enumset-QUAY`
 
-| Value | URI       | Meaning                             |
-| :---- | :-------- | :---------------------------------- |
-| `0` | `g7:enum-0` | Unreliable evidence or estimated data |
-| `1` | `g7:enum-1` | Questionable reliability of evidence (interviews, census, oral genealogies, or potential for bias, such as an autobiography) |
-| `2` | `g7:enum-2` | Secondary evidence, data officially recorded sometime after the event |
-| `3` | `g7:enum-3` | Direct and primary evidence used, or by dominance of the evidence |
+| Value | URI         | Meaning                             |
+| :---- | ----------- | :---------------------------------- |
+| `0`   | `g7:enum-0` | Unreliable evidence or estimated data |
+| `1`   | `g7:enum-1` | Questionable reliability of evidence (interviews, census, oral genealogies, or potential for bias, such as an autobiography) |
+| `2`   | `g7:enum-2` | Secondary evidence, data officially recorded sometime after the event |
+| `3`   | `g7:enum-3` | Direct and primary evidence used, or by dominance of the evidence |
 
 Although the values look like integers, they do not have numeric meaning.
 
@@ -125,13 +104,13 @@ The structures for representing the strength of and confidence in various claims
 
 ### `g7:enumset-RESN`
 
-| Value | URI | Meaning                      |
-| :---- | :-- | :--------------------------- |
+| Value          | URI                    | Meaning                      |
+| :------------- | ---------------------- | :--------------------------- |
 | `CONFIDENTIAL` | `g7:enum-CONFIDENTIAL` | This data was marked as confidential by the user. |
-| `LOCKED` | `g7:enum-LOCKED` | Some systems may ignore changes to this data. |
-| `PRIVACY` | `g7:enum-PRIVACY` | This data is not to be shared outside of a trusted circle, generally because it contains information about living individuals. This definition is known to admit multiple interpretations, so use of the `PRIVACY` restriction notice is not recommended. |
+| `LOCKED`       | `g7:enum-LOCKED`       | Some systems may ignore changes to this data. |
+| `PRIVACY`      | `g7:enum-PRIVACY`      | This data is not to be shared outside of a trusted circle, generally because it contains information about living individuals. This definition is known to admit multiple interpretations, so use of the `PRIVACY` restriction notice is not recommended. |
 
-It is recommended that applications allow users to chose how `CONFIDENTIAL` and/or `PRIVACY` data is handled
+It is recommended that applications allow users to choose how `CONFIDENTIAL` and/or `PRIVACY` data is handled
 when interfacing with other users or applications,
 for example by allowing them to exclude such data when exporting.
 
@@ -158,23 +137,23 @@ It is anticipated that a future version will deprecate the `PRIVACY` option and
 
 ### `g7:enumset-ROLE`
 
-| Value | URI | Meaning |
-| ----- | :-- | :------ |
-| `CHIL` | `g7:enum-CHIL` | Child |
-| `CLERGY` | `g7:enum-CLERGY` | Religious official in event; implies `OFFICIATOR` |
-| `FATH` | `g7:enum-FATH` | Father; implies `PARENT` |
-| `FRIEND` | `g7:enum-FRIEND` | Friend |
-| `GODP` | `g7:enum-GODP` | Godparent or related role in other religions |
-| `HUSB` | `g7:enum-HUSB` | Husband; implies `SPOU` |
-| `MOTH` | `g7:enum-MOTH` | Mother; implies `PARENT` |
-| `MULTIPLE` | `g7:enum-MULTIPLE` | A sibling from the same pregnancy (twin, triplet, quadruplet, and so on). A `PHRASE` can be used to specify the kind of multiple birth. |
-| `NGHBR` | `g7:enum-NGHBR` | Neighbor |
-| `OFFICIATOR` | `g7:enum-OFFICIATOR` | Officiator of the event |
-| `PARENT` | `g7:enum-PARENT` | Parent |
-| `SPOU` | `g7:enum-SPOU` | Spouse |
-| `WIFE` | `g7:enum-WIFE` | Wife; implies `SPOU` |
-| `WITN` | `g7:enum-WITN` | Witness |
-| `OTHER` | `g7:enum-OTHER` | A value not listed here; should have a `PHRASE` substructure |
+| Value       | URI                 | Meaning |
+| ----------- | ------------------- | :------ |
+| `CHIL`      | `g7:enum-CHIL`      | Child |
+| `CLERGY`    | `g7:enum-CLERGY`    | Religious official in event; implies `OFFICIATOR` |
+| `FATH`      | `g7:enum-FATH`      | Father; implies `PARENT` |
+| `FRIEND`    | `g7:enum-FRIEND`    | Friend |
+| `GODP`      | `g7:enum-GODP`      | Godparent or related role in other religions |
+| `HUSB`      | `g7:enum-HUSB`      | Husband; implies `SPOU` |
+| `MOTH`      | `g7:enum-MOTH`      | Mother; implies `PARENT` |
+| `MULTIPLE`  | `g7:enum-MULTIPLE`  | A sibling from the same pregnancy (twin, triplet, quadruplet, and so on). A `PHRASE` can be used to specify the kind of multiple birth. |
+| `NGHBR`     | `g7:enum-NGHBR`     | Neighbor |
+| `OFFICIATOR`| `g7:enum-OFFICIATOR`| Officiator of the event |
+| `PARENT`    | `g7:enum-PARENT`    | Parent |
+| `SPOU`      | `g7:enum-SPOU`      | Spouse |
+| `WIFE`      | `g7:enum-WIFE`      | Wife; implies `SPOU` |
+| `WITN`      | `g7:enum-WITN`      | Witness |
+| `OTHER`     | `g7:enum-OTHER`     | A value not listed here; should have a `PHRASE` substructure |
 
 These should be interpreted in the context of the recorded event and its primary participants.
 For example, if you cite a child’s birth record as the source of the mother’s name, the value for this field is “`MOTH`.”
@@ -182,12 +161,12 @@ If you describe the groom of a marriage, the role is “`HUSB`.”
 
 ### `g7:enumset-SEX`
 
-| Value | URI | Meaning                                     |
-| ----- | :-- | :------------------------------------------ |
-| `M` | `g7:enum-M` | Male                                        |
-| `F` | `g7:enum-F` | Female                                      |
-| `X` | `g7:enum-X` | Does not fit the typical definition of only Male or only Female |
-| `U` | `g7:enum-U` | Cannot be determined from available sources |
+| Value | URI         | Meaning                                     |
+| ----- | ----------- | :------------------------------------------ |
+| `M`   | `g7:enum-M` | Male                                        |
+| `F`   | `g7:enum-F` | Female                                      |
+| `X`   | `g7:enum-X` | Does not fit the typical definition of only Male or only Female |
+| `U`   | `g7:enum-U` | Cannot be determined from available sources |
 
 This can describe an individual’s reproductive or sexual anatomy at birth.
 Related concepts of gender identity or sexual preference
@@ -195,11 +174,11 @@ are not currently given their own tag. Cultural or personal gender preference ma
 
 ### `g7:enumset-FAMC-STAT`
 
-| Value | URI | Meaning                        |
-| ----- | :-- | :----------------------------- |
+| Value        | URI                  | Meaning                        |
+| ------------ | -------------------- | :----------------------------- |
 | `CHALLENGED` | `g7:enum-CHALLENGED` | Linking this child to this family is suspect, but the linkage has been neither proven nor disproven. |
-| `DISPROVEN` | `g7:enum-DISPROVEN` | There has been a claim by some that this child belongs to this family, but the linkage has been disproven. |
-| `PROVEN` | `g7:enum-PROVEN` | Linking this child to this family has been proven. |
+| `DISPROVEN`  | `g7:enum-DISPROVEN`  | There has been a claim by some that this child belongs to this family, but the linkage has been disproven. |
+| `PROVEN` | `g7:enum-PROVEN`         | Linking this child to this family has been proven. |
 
 When these enumeration values were introduced in version 5.5.1 it was assumed, but never specified, that "proven" referred to [the definition provided by the Board for Certification of Genealogists](https://www.familysearch.org/en/wiki/Genealogical_Proof_Standard).
 Because that meaning was not specified and other definitions of "proven" exist, existing files might use these values in other ways.
@@ -228,29 +207,29 @@ If so, that is indicated in the "status" column below.
 Like the "applies to" column, the "status" column is a recommendation, not a requirement,
 and applications should be prepared to encounter non-current values.
 
-| Value | URI | Applies to | Meaning                             | Status |
-| ----- | --- | ---------- | :---------------------------------- | :----- |
-| `BIC` | `g7:enum-BIC` | `SLGC` | Born in the covenant, so child to parent sealing ordinance is not required. | Current |
-| `CANCELED` | `g7:enum-CANCELED` | `SLGS` | Canceled and considered invalid. | Current |
-| `CHILD` | `g7:enum-CHILD` | All but `SLGC` | Died before 8 years old, so ordinances other than child to parent sealing are not required. | Current |
-| `COMPLETED` | `g7:enum-COMPLETED` | All | Completed, but the date is not known. | Deprecated, use `DATE BEF date` instead. This status was defined for use with [TempleReady](https://www.churchofjesuschrist.org/study/ensign/1994/02/news-of-the-church/templeready-now-available) which is no longer in use. |
-| `EXCLUDED` | `g7:enum-EXCLUDED` | All | Patron excluded this ordinance from being cleared in this submission. | Deprecated. This status was defined for use with TempleReady which is no longer in use. |
-| `DNS` | `g7:enum-DNS` | `SLGC`, `SLGS` | This ordinance is not authorized. | Current |
-| `DNS_CAN` | `g7:enum-DNS_CAN` | `SLGS` | This ordinance is not authorized, and the previous ordinance is cancelled. | Current |
-| `INFANT` | `g7:enum-INFANT` | All but `SLGC` | Died before less than 1 year old, baptism or endowment not required. | Deprecated. Use `CHILD` instead. |
-| `PRE_1970` | `g7:enum-PRE_1970` | All | Ordinance was likely completed because an ordinance for this person was converted from temple records of work completed before 1970. | Deprecated.  Use `DATE BEF 1970` instead. |
-| `STILLBORN` | `g7:enum-STILLBORN` | All | Born dead, so no ordinances are required. | Current |
-| `SUBMITTED` | `g7:enum-SUBMITTED` | All | Ordinance was previously submitted. | Deprecated. This status was defined for use with TempleReady which is no longer in use. |
-| `UNCLEARED` | `g7:enum-UNCLEARED` | All | Data for clearing the ordinance request was insufficient. | Deprecated. This status was defined for use with TempleReady which is no longer in use. |
+| Value | URI       | Applies to | Meaning                             | Status |
+| ----- | ----------- | :---------------------------------- | :----- |
+| `BIC` | `g7:enum-BIC`  | `SLGC` | Born in the covenant, so child to parent sealing ordinance is not required. | Current |
+| `CANCELED` | `g7:enum-CANCELED`  | `SLGS` | Canceled and considered invalid. | Current |
+| `CHILD` | `g7:enum-CHILD`  | All but `SLGC` | Died before 8 years old, so ordinances other than child to parent sealing are not required. | Current |
+| `COMPLETED` | `g7:enum-COMPLETED`  | All | Completed, but the date is not known. | Deprecated, use `DATE BEF date` instead. This status was defined for use with [TempleReady](https://www.churchofjesuschrist.org/study/ensign/1994/02/news-of-the-church/templeready-now-available) which is no longer in use. |
+| `EXCLUDED` | `g7:enum-EXCLUDED`  | All | Patron excluded this ordinance from being cleared in this submission. | Deprecated. This status was defined for use with TempleReady which is no longer in use. |
+| `DNS` | `g7:enum-DNS`  | `SLGC`, `SLGS` | This ordinance is not authorized. | Current |
+| `DNS_CAN` | `g7:enum-DNS_CAN`  | `SLGS` | This ordinance is not authorized, and the previous ordinance is cancelled. | Current |
+| `INFANT` | `g7:enum-INFANT`  | All but `SLGC` | Died before 1 year old, baptism or endowment not required. | Deprecated. Use `CHILD` instead. |
+| `PRE_1970` | `g7:enum-PRE_1970`  | All | Ordinance was likely completed because an ordinance for this person was converted from temple records of work completed before 1970. | Deprecated.  Use `DATE BEF 1970` instead. |
+| `STILLBORN` | `g7:enum-STILLBORN`  | All | Born dead, so no ordinances are required. | Current |
+| `SUBMITTED` | `g7:enum-SUBMITTED`  | All | Ordinance was previously submitted. | Deprecated. This status was defined for use with TempleReady which is no longer in use. |
+| `UNCLEARED` | `g7:enum-UNCLEARED`  | All | Data for clearing the ordinance request was insufficient. | Deprecated. This status was defined for use with TempleReady which is no longer in use. |
 
 ### `g7:enumset-NAME-TYPE`
 
-| Value | URI | Meaning                       |
-| ----- | :-- | :---------------------------- |
-| `AKA` | `g7:enum-AKA` | Also known as, alias, etc. |
-| `BIRTH` | `g7:enum-BIRTH` | Name given at or near birth. |
-| `IMMIGRANT` | `g7:enum-IMMIGRANT` | Name assumed at the time of immigration. |
-| `MAIDEN` | `g7:enum-MAIDEN` | Maiden name, name before first marriage. |
-| `MARRIED` | `g7:enum-MARRIED` | Married name, assumed as part of marriage. |
-| `PROFESSIONAL` | `g7:enum-PROFESSIONAL` | Name used professionally (pen, screen, stage name). |
-| `OTHER` | `g7:enum-OTHER` | A value not listed here; should have a `PHRASE` substructure |
+| Value         | URI                   | Meaning                       |
+| ------------- | --------------------- | :---------------------------- |
+| `AKA`         | `g7:enum-AKA`         | Also known as, alias, etc. |
+| `BIRTH`       | `g7:enum-BIRTH`       | Name given at or near birth. |
+| `IMMIGRANT`   | `g7:enum-IMMIGRANT`   | Name assumed at the time of immigration. |
+| `MAIDEN`      | `g7:enum-MAIDEN`      | Maiden name, name before first marriage. |
+| `MARRIED`     | `g7:enum-MARRIED`     | Married name, assumed as part of marriage. |
+| `PROFESSIONAL`| `g7:enum-PROFESSIONAL`| Name used professionally (pen, screen, stage name). |
+| `OTHER`       | `g7:enum-OTHER`       | A value not listed here; should have a `PHRASE` substructure |
diff --git a/specification/gedcom-6-appendix-calendars.md b/specification/gedcom-6-appendix-calendars.md
index 97e9718e..7e534567 100644
--- a/specification/gedcom-6-appendix-calendars.md
+++ b/specification/gedcom-6-appendix-calendars.md
@@ -62,7 +62,7 @@ The French Republican calendar or French Revolutionary calendar are the names gi
 
 Permitted months are
 
-|`stdTag`| URI             | Name               |
+|`stdTag`| URI             |Name                |
 |:-------|:----------------|:-------------------|
 |`VEND`  | `g7:month-VEND` |Vendémiaire         |
 |`BRUM`  | `g7:month-BRUM` |Brumaire            |
@@ -86,8 +86,8 @@ The URI for this calendar is `g7:cal-FRENCH_R`
 
 The Hebrew calendar is the name given to the calendar used by Jewish peoples around the world which developed into its current form in the early ninth century. It traditionally marks new days at sunset, not midnight. Its first day (1 Tishrei 1) primarily overlapped with Gregorian 7 September 3761 BCE and Julian 7 October 3761 BCE (starting at sunset on the 6th day of those months).
 
-|`stdTag`| URI             |Name                                                   |
-|:-------|:----------------|:------------------------------------------------------|
+|`stdTag`| URI            | Name                                                   |
+|:-------|:---------------|:-------------------------------------------------------|
 |`TSH`   | `g7:month-TSH` | Tishrei (תִּשְׁרֵי) |
 |`CSH`   | `g7:month-CSH` | Marcheshvan (מַרְחֶשְׁוָן) or Cheshvan (חֶשְׁוָן) |
 |`KSL`   | `g7:month-KSL` | Kislev (כִּסְלֵו) |
diff --git a/specification/subsumes.tsv b/specification/subsumes.tsv
new file mode 100644
index 00000000..53dd6114
--- /dev/null
+++ b/specification/subsumes.tsv
@@ -0,0 +1,2 @@
+may-convert-from	may-convert-to
+https://gedcom.io/terms/v5.5.1/ABBR	https://gedcom.io/terms/v7/ABBR