diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index fdbd1dce5..000000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-version: 2
-aliases:
-- &post_build
-  name: Trigger downstream builds
-  command: |
-    echo 'export CIRCLE_SHA1="$CIRCLE_SHA1"' >> $BASH_ENV
-    echo 'export CIRCLE_PROJECT_REPONAME="$CIRCLE_PROJECT_REPONAME"' >> $BASH_ENV
-    echo 'export GITHUB_TOKEN="$GITHUB_TOKEN"' >> $BASH_ENV
-    /tools/trigger_build.sh "entur/netex-java-model.git" "master" "$(git log -1 --pretty=%B)"
-jobs:
-  build:
-    docker:
-    - image: eu.gcr.io/carbon-1287/circleci-toolbox-image
-      auth:
-        username: _json_key
-        password: $GCLOUD_SERVICE_KEY
-    steps:
-    - checkout
-    - run: echo "Running xmllint to validate schema"
-    - run: xmllint --noout --schema xsd/NeTEx_publication.xsd examples/functions/stopPlace/Netex_01_StopPoints_NoFrills_1.xml
-    - run: echo "Finished running xmllint"
-  trigger-dependants:
-    docker:
-      - image: eu.gcr.io/carbon-1287/circleci-toolbox-image
-        auth:
-          username: _json_key
-          password: $GCLOUD_SERVICE_KEY
-    steps:
-      - run: *post_build
-workflows:
-  version: 2
-  install-validate:
-    jobs:
-    - build:
-        context: org-carbon
-    - trigger-dependants:
-        context: org-carbon
-        requires:
-          - build
-        filters:
-          branches:
-            only:
-            - master
diff --git a/examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml b/examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml
index b20ddfa2e..ac5bf4d74 100644
--- a/examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml
+++ b/examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml
@@ -3520,9 +3520,9 @@ Oyster_PayAsYouGo_right -   PayAsYouGo_trip
 										<VehicleModes>metro</VehicleModes>
 									</validityParameters>
 								</GenericParameterAssignment>
-								<GenericParameterAssignment version="any" order="2" id="tfl:Prepaid_trip">
+								<GenericParameterAssignment version="any" order="2" id="tfl:Prepaid_trip@single">
 									<Name>Cant Break Metro journeys</Name>
-									<Description>  														Flat far simgle tripcase. </Description>
+									<Description>Flat fare single trip case.</Description>
 									<TypeOfAccessRightAssignmentRef version="any" ref="tfl:condition_of_use"/>
 									<limitations>
 										<InterchangingRef ref="tfl:no_interchange_cannot_break_journey" version="any"/>
@@ -13565,7 +13565,7 @@ All other journeys on this service	
 														<GroupTicketRef version="any" ref="lrs:River_cruise"/>
 													</limitations>
 												</GenericParameterAssignment>
-												<GenericParameterAssignment version="any" order="2" id="lrs:London_Eye_River_tour@01@Freedom_passNot">
+												<GenericParameterAssignment version="any" order="2" id="lrs:London_Eye_River_tour@01@TravelCard_Freedom_passNot">
 													<Description>Travelcard and Freedom Pass discounts do not apply on this route.</Description>
 													<IsAllowed>false</IsAllowed>
 													<TypeOfAccessRightAssignmentRef version="any" ref="tfl:eligible"/>
@@ -14280,7 +14280,7 @@ Oyster card holders who want to travel on the Emirates Air Line as part of a 360
 										<VehicleModes>cableway</VehicleModes>
 									</validityParameters>
 								</GenericParameterAssignment>
-								<GenericParameterAssignment version="any" order="2" id="ea:360_cableway_trip">
+								<GenericParameterAssignment version="any" order="2" id="ea:360_cableway_trip@CannotBreakJourney">
 									<TypeOfAccessRightAssignmentRef version="any" ref="tfl:condition_of_use"/>
 									<ValidableElementRef version="any" ref="ea:cableway_trip"/>
 									<limitations>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd
index a222013d7..43f56a08c 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd
@@ -161,7 +161,7 @@ Rail transport, Roads and Road transport
 			</xsd:element>
 			<xsd:element ref="AssistanceFacilityList" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>List of Couchette FACILITies.</xsd:documentation>
+					<xsd:documentation>List of ASSISTANCE FACILITies.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element ref="AccessibilityToolList" minOccurs="0">
@@ -214,7 +214,7 @@ Rail transport, Roads and Road transport
 			<xsd:element ref="AccessibilityInfoFacilityList" minOccurs="0"/>
 			<xsd:element ref="AssistanceFacilityList" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>List of Couchette FACILITies.</xsd:documentation>
+					<xsd:documentation>List of ASSISTANCE FACILITies.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element ref="CateringFacilityList" minOccurs="0"/>
@@ -376,7 +376,7 @@ Rail transport, Roads and Road transport
 				</xsd:element>
 				<xsd:element ref="AssistanceFacilityList">
 					<xsd:annotation>
-						<xsd:documentation>List of Couchette FACILITies.</xsd:documentation>
+						<xsd:documentation>List of ASSISTANCE FACILITies.</xsd:documentation>
 					</xsd:annotation>
 				</xsd:element>
 				<xsd:element ref="FareClasses">
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd
index 9a86c97b6..5554f1cf1 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd
@@ -1401,7 +1401,7 @@ Rail transport, Roads and Road transport
 			</xsd:element>
 			<xsd:element name="VisualGuidanceBands" type="xsd:boolean" default="false" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Whether crossing has tactile guidance strips.</xsd:documentation>
+					<xsd:documentation>Whether crossing has visual guidance bands or guidance strips.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="DroppedKerb" type="xsd:boolean" minOccurs="0">
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd
index 0b7680051..d9f6e22d4 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd
@@ -479,9 +479,9 @@ Rail transport, Roads and Road transport
 			<xsd:documentation>Elements for a RUBBISH DISPOSAL EQUIPMENT type.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:sequence>
-			<xsd:element name="SharpsDispsal" type="xsd:boolean" minOccurs="0">
+			<xsd:element name="SharpsDisposal" type="xsd:boolean" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Whether there is CCTV.</xsd:documentation>
+					<xsd:documentation>Whether there are disposal facilities for needles or medical sharps.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="Recycling" type="xsd:boolean" minOccurs="0">
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version.xsd
index 8cbe4a8de..325167355 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version.xsd
@@ -361,7 +361,7 @@ Rail transport, Roads and Road transport
 							<xsd:group ref="GeneralSignGroup"/>
 						</xsd:sequence>
 					</xsd:sequence>
-					<xsd:attribute name="id" type="HeadingSignIdType" use="optional">
+					<xsd:attribute name="id" type="GeneralSignIdType" use="optional">
 						<xsd:annotation>
 							<xsd:documentation>Identifier of ENTITY.</xsd:documentation>
 						</xsd:annotation>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd
index 783bc438d..749f34310 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd
@@ -183,7 +183,7 @@ Rail transport, Roads and Road transport
 			</xsd:element>
 			<xsd:element name="ScopeOfTicketsAvailable" type="ScopeOfTicketListOfEnumerations" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Types of Ticket available.</xsd:documentation>
+					<xsd:documentation>Scope of Ticket available.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 		</xsd:sequence>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd
index ac4f3b8cb..0fa9301bc 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd
@@ -363,7 +363,7 @@ Rail transport, Roads and Road transport
 			</xsd:element>
 			<xsd:element name="LuggageTrolleys" type="xsd:boolean" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Whether there are wheel chair trolleys.</xsd:documentation>
+					<xsd:documentation>Whether there are trolleys.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="WheelchairLuggageTrolleys" type="xsd:boolean" minOccurs="0">
@@ -508,7 +508,7 @@ Rail transport, Roads and Road transport
 		<xsd:sequence>
 			<xsd:element name="CounterService" type="xsd:boolean" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Whether there are wheel chair trolleys.</xsd:documentation>
+					<xsd:documentation>Whether left luggage is a counter service.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="SelfServiceLockers" type="xsd:boolean" minOccurs="0">
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd
index fc36ecb07..bcbf9a16e 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd
@@ -176,7 +176,7 @@ Rail transport, Roads and Road transport
 			</xsd:element>
 			<xsd:element name="RightSideBorder" type="BorderTypeEnumeration" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Type of border on the right side (n the direction of the PATH LINK).+v1.1</xsd:documentation>
+					<xsd:documentation>Type of border on the right side (in the direction of the PATH LINK).</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="LeftSideBorder" type="BorderTypeEnumeration" minOccurs="0">
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd
index 526a8bb5d..a6bd221a4 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd
@@ -569,7 +569,7 @@ Rail transport, Roads and Road transport
 			</xsd:element>
 			<xsd:element name="Description" type="MultilingualString" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Name of LEVEL.</xsd:documentation>
+					<xsd:documentation>Description of LEVEL.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="PublicCode" type="xsd:normalizedString" minOccurs="0">
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd
index 1a4075f78..5f20ebf88 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd
@@ -749,7 +749,7 @@ contained within its parent QUAY.</xsd:documentation>
 			</xsd:element>
 			<xsd:element name="PassageType" type="PassageTypeEnumeration" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Type of ACCESS SPACE.</xsd:documentation>
+					<xsd:documentation>Type of passage associated with ACCESS SPACE.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 		</xsd:sequence>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support.xsd
index 889a891d6..80db465f2 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support.xsd
@@ -121,7 +121,7 @@ Rail transport, Roads and Road transport
 			<xsd:enumeration value="motorcycle"/>
 			<xsd:enumeration value="sportingEquipment"/>
 			<xsd:enumeration value="skis"/>
-			<xsd:enumeration value="musicalnstrument"/>
+			<xsd:enumeration value="musicalInstrument"/>
 			<xsd:enumeration value="pushChair"/>
 			<xsd:enumeration value="wheelchair"/>
 			<xsd:enumeration value="motorizedWheelchair"/>