diff --git a/known-issues.yml b/known-issues.yml
index e58c1a3..b052d1a 100644
--- a/known-issues.yml
+++ b/known-issues.yml
@@ -20,7 +20,7 @@ zib-Patient:
         reason: The name information according to zib NameInformation may be split up over multiple instances of Patient.name.
     Patient.telecom*:
       - datatype: ContactPoint instead of a reference
-        reason: ContactInformation in FHIR is represented using the ContactPoint datatype, not as a separate resource.
+        reason: Contact information in FHIR is represented using the ContactPoint datatype, not as a separate resource.
     Patient.telecom:
       - cardinality: 0..* instead of 0..1
         for: NL-CM:0.1.5 (Patient.ContactInformation)
diff --git a/release-notes.md b/release-notes.md
index 9fddd60..7da8ae2 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -1,16 +1,14 @@
 ## LanguageProficiency (zib-Patient, nl-core-Patient)
-* `.communication.extension:patient-proficiency:languageControlListening` ; terminology ; Changed codes in LanguageControlListeningCodelist ; ZIB-1877
-* `.communication.extension:patient-proficiency:languageControlSpeaking` ; terminology ; Changed codes in LanguageControlSpeakingCodelist ; ZIB-1877
-* `.communication.extension:patient-proficiency:languageControlReading` ; terminology ; Changed codes in LanguageControlReadingCodelist; ZIB-1877
+* `.communication.extension:languageControl.extension:level.value[x]` ; terminology ; Changed codes in LanguageControlListeningCodelist, LanguageControlSpeakingCodelist and LanguageControlReadingCodelist. ; ZIB-1877
 * `.communication.extension:comment` ; extension ; Replaced the extension `ext-Comment` with the extension `ext-LanguageProficiency.Comment`. ; ZIBFHIR-97
 
 ## MaritalStatus (zib-Patient, nl-core-Patient)
-* `.maritalStatus` ; terminology ; Changed codes in MaritalStatusCodelist ; ZIB-2218
+* `.maritalStatus` ; terminology ; Changed codes in MaritalStatusCodelist. ; ZIB-2218
 
 ## Nationality (zib-Patient, nl-core-Patient)
 * No significant changes.
 
 ## Patient (zib-Patient, nl-core-Patient)
-* `.extension:genderIdentity.value[x]` ; extension ; Added GenderIdentity for GenderIdentity ; ZIB-1693
-* `.gender` ; terminology ; Added guidance in GeslachtCodelijst-to-AdministrativeGender ConceptMap ; ZIB-1239
-* `.multipleBirth[x]:multipleBirthInteger` ; mapping ; Added mapping of MultipleBirthSequence ; ZIB-1670
\ No newline at end of file
+* `.extension:genderIdentity.value[x]` ; extension ; Added extension `patient-genderIdentity` for GenderIdentity. ; ZIB-1693
+* `.gender` ; terminology ; Changed code description in GeslachtCodelijst. ; ZIB-1239
+* `.multipleBirth[x]:multipleBirthInteger` ; mapping ; Added mapping of MultipleBirthSequence. ; ZIB-1670
\ No newline at end of file
diff --git a/zib/vocabulary/manual/ConceptMap-GeslachtCodelijst-to-AdministrativeGender.xml b/zib/vocabulary/manual/ConceptMap-GeslachtCodelijst-to-AdministrativeGender.xml
index 305296f..ff34e85 100644
--- a/zib/vocabulary/manual/ConceptMap-GeslachtCodelijst-to-AdministrativeGender.xml
+++ b/zib/vocabulary/manual/ConceptMap-GeslachtCodelijst-to-AdministrativeGender.xml
@@ -25,7 +25,6 @@
   <copyright value="Copyright and related rights waived via CC0, https://creativecommons.org/publicdomain/zero/1.0/. This does not apply to information from third parties, for example a medical terminology system. The implementer alone is responsible for identifying and obtaining any necessary licenses or authorizations to utilize third party IP in connection with the specification or otherwise." />
   <targetCanonical value="http://hl7.org/fhir/ValueSet/administrative-gender"/>
   <group>
-    <!-- 2.16.840.1.113883.5.1 -->
     <source value="http://terminology.hl7.org/CodeSystem/v3-AdministrativeGender"/>
     <target value="http://hl7.org/fhir/administrative-gender"/>
     <element>
@@ -52,7 +51,6 @@
     </element>
   </group>
   <group>
-    <!-- 2.16.840.1.113883.5.1008 -->
     <source value="http://terminology.hl7.org/CodeSystem/v3-NullFlavor"/>
     <target value="http://hl7.org/fhir/administrative-gender"/>
     <element>