diff --git a/A320-100-CFM-set.xml b/A320-100-CFM-set.xml
index 9a966b73..2503a080 100644
--- a/A320-100-CFM-set.xml
+++ b/A320-100-CFM-set.xml
@@ -5,11 +5,6 @@
 <PropertyList include="A320-main.xml">
 
 	<sim>
-	
-		<sound>
-			<path>Aircraft/A320-family/Sounds/cfm56-sound.xml</path>
-		</sound>
-		<checklists include="A32X-Checklists.xml"/>
 		<description>Airbus A320-111 (CFM56-5A1)</description>
 		<flight-model>jsb</flight-model>
 		<aero>A320-100-CFM</aero>
@@ -28,6 +23,10 @@
 			<model type="int">4</model>
 		</rating>
 		
+		<sound>
+			<path>Aircraft/A320-family/Sounds/cfm56-sound.xml</path>
+		</sound>
+		
 		<previews>
 			<preview>
 				<type>exterior</type>
@@ -163,25 +162,17 @@
 			</config>
 		</view>
 		
-		<systems>
-      <wingflexer include="Systems/wingflexer-params.xml"/>
-      <property-rule n="100">
-        <name>wing flexer property rule</name>
-        <path>Aircraft/Generic/wingflexer.xml</path>
-      </property-rule>
-    </systems>
-		
 		<systems n="0">
-            <autopilot n="0">
-                <path>Aircraft/A320-family/Systems/fadec-cfm.xml</path>
-            </autopilot>
+			<autopilot n="0">
+				<path>Aircraft/A320-family/Systems/fadec-cfm.xml</path>
+			</autopilot>
 			<autopilot n="10">
 				<path>Aircraft/A320-family/Systems/cfm56-sound.xml</path>
 			</autopilot>
 		</systems>
 
 	</sim>
-        
+		
 	<limits>
 		<mass-and-balance> <!--Data source: TCDS WV 002 (Issue 12) -->
 			<maximum-takeoff-mass-lbs>150000</maximum-takeoff-mass-lbs>
diff --git a/A320-200-CFM-set.xml b/A320-200-CFM-set.xml
index abdd86fb..a6e18ac3 100644
--- a/A320-200-CFM-set.xml
+++ b/A320-200-CFM-set.xml
@@ -5,11 +5,6 @@
 <PropertyList include="A320-main.xml">
 
 	<sim>
-	
-		<sound>
-			<path>Aircraft/A320-family/Sounds/cfm56-sound.xml</path>
-		</sound>
-		<checklists include="A32X-Checklists.xml"/>
 		<description>Airbus A320-214 (CFM56-5B4)</description>
 		<flight-model>jsb</flight-model>
 		<aero>A320-200-CFM</aero>
@@ -28,6 +23,10 @@
 			<model type="int">4</model>
 		</rating>
 		
+		<sound>
+			<path>Aircraft/A320-family/Sounds/cfm56-sound.xml</path>
+		</sound>
+		
 		<previews>
 			<preview>
 				<type>exterior</type>
@@ -163,25 +162,17 @@
 			</config>
 		</view>
 		
-		<systems>
-      <wingflexer include="Systems/wingflexer-params.xml"/>
-      <property-rule n="100">
-        <name>wing flexer property rule</name>
-        <path>Aircraft/Generic/wingflexer.xml</path>
-      </property-rule>
-    </systems>
-		
 		<systems n="0">
-            <autopilot n="0">
-                <path>Aircraft/A320-family/Systems/fadec-cfm.xml</path>
-            </autopilot>
+			<autopilot n="0">
+				<path>Aircraft/A320-family/Systems/fadec-cfm.xml</path>
+			</autopilot>
 			<autopilot n="10">
 				<path>Aircraft/A320-family/Systems/cfm56-sound.xml</path>
 			</autopilot>
 		</systems>
 
 	</sim>
-        
+		
 	<limits>
 		<mass-and-balance> <!--Data source: TCDS WV 017-->
 			<maximum-takeoff-mass-lbs>172000</maximum-takeoff-mass-lbs>
diff --git a/A320-200-IAE-set.xml b/A320-200-IAE-set.xml
index 57939e65..61d17a7a 100644
--- a/A320-200-IAE-set.xml
+++ b/A320-200-IAE-set.xml
@@ -5,11 +5,6 @@
 <PropertyList include="A320-main.xml">
 
 	<sim>
-	
-		<sound>
-			<path>Aircraft/A320-family/Sounds/v2500-sound.xml</path>
-		</sound>
-		<checklists include="A32X-Checklists.xml"/>
 		<description>Airbus A320-232 (IAE V2527-A5)</description>
 		<flight-model>jsb</flight-model>
 		<aero>A320-200-IAE</aero>
@@ -28,6 +23,10 @@
 			<model type="int">4</model>
 		</rating>
 		
+		<sound>
+			<path>Aircraft/A320-family/Sounds/v2500-sound.xml</path>
+		</sound>
+		
 		<previews>
 			<preview>
 				<type>exterior</type>
@@ -163,25 +162,17 @@
 			</config>
 		</view>
 		
-		<systems>
-      <wingflexer include="Systems/wingflexer-params.xml"/>
-      <property-rule n="100">
-        <name>wing flexer property rule</name>
-        <path>Aircraft/Generic/wingflexer.xml</path>
-      </property-rule>
-    </systems>
-		
 		<systems n="0">
-            <autopilot n="0">
-                <path>Aircraft/A320-family/Systems/fadec-iae.xml</path>
-            </autopilot>
+			<autopilot n="0">
+				<path>Aircraft/A320-family/Systems/fadec-iae.xml</path>
+			</autopilot>
 			<autopilot n="10">
 				<path>Aircraft/A320-family/Systems/v2500-sound.xml</path>
 			</autopilot>
 		</systems>
 
 	</sim>
-        
+		
 	<limits>
 		<mass-and-balance> <!--Data source: TCDS WV 017-->
 			<maximum-takeoff-mass-lbs>172000</maximum-takeoff-mass-lbs>
diff --git a/A320-main.xml b/A320-main.xml
index 0b8ee785..a1c01231 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -8,6 +8,8 @@
 
 		<author>Josh Davidson/Octal450 (Flight Dynamics, Systems, Displays), Jonathan Redpath/legoboyvdlp, merspieler, Matthew Maring/mattmaring (Systems, Displays), Thorsten Herrmann/TH-555, Semir Gebran/CaptB (3D, Textures)</author>
 		
+		<checklists include="A32X-Checklists.xml"/>
+		
 		<status>Pre V1.0</status>
 		
 		<hud n="0">
@@ -147,6 +149,11 @@
 			<autopilot n="13">
 				<path>Aircraft/A320-family/Systems/ecam-proprules.xml</path>
 			</autopilot>
+			<wingflexer include="Systems/wingflexer-params.xml"/>
+			<property-rule n="100">
+				<name>Generic Wing Flexer</name>
+				<path>Aircraft/Generic/wingflexer.xml</path>
+			</property-rule>
 			<path>Aircraft/A320-family/Systems/pitot-static.xml</path>
 		</systems>
 		
diff --git a/A320neo-CFM-set.xml b/A320neo-CFM-set.xml
index 551801ab..8cfb9497 100644
--- a/A320neo-CFM-set.xml
+++ b/A320neo-CFM-set.xml
@@ -4,12 +4,7 @@
 
 <PropertyList include="A320-main.xml">
 
-	<sim>
-            
-		<sound>
-			<path>Aircraft/A320-family/Sounds/leapx-sound.xml</path>
-		</sound>
-		<checklists include="A32X-Checklists.xml"/>
+	<sim> 
 		<description>Airbus A320-251N (LEAP-1A26)</description>
 		<flight-model>jsb</flight-model>
 		<aero>A320neo-CFM</aero>
@@ -26,7 +21,11 @@
 			<systems type="int">5</systems>
 			<cockpit type="int">5</cockpit>
 			<model type="int">4</model>
-		</rating>
+		</rating> 
+		
+		<sound>
+			<path>Aircraft/A320-family/Sounds/leapx-sound.xml</path>
+		</sound>
 		
 		<previews>
 			<preview>
@@ -163,25 +162,17 @@
 			</config>
 		</view>
 		
-		<systems>
-      <wingflexer include="Systems/wingflexer-params.xml"/>
-      <property-rule n="100">
-        <name>wing flexer property rule</name>
-        <path>Aircraft/Generic/wingflexer.xml</path>
-      </property-rule>
-    </systems>
-		
 		<systems n="0">
-            <autopilot n="0">
-                <path>Aircraft/A320-family/Systems/fadec-cfm.xml</path>
-            </autopilot>
+			<autopilot n="0">
+				<path>Aircraft/A320-family/Systems/fadec-cfm.xml</path>
+			</autopilot>
 			<autopilot n="10">
 				<path>Aircraft/A320-family/Systems/leapx-sound.xml</path>
 			</autopilot>
 		</systems>
 
 	</sim>
-        
+		
 	<limits>
 		<mass-and-balance> <!--Data source: TCDS WV 55 -->
 			<maximum-takeoff-mass-lbs>174200</maximum-takeoff-mass-lbs>
diff --git a/A320neo-PW-set.xml b/A320neo-PW-set.xml
index 93b7660f..805fddf3 100644
--- a/A320neo-PW-set.xml
+++ b/A320neo-PW-set.xml
@@ -5,11 +5,6 @@
 <PropertyList include="A320-main.xml">
 
 	<sim>
-	
-		<sound>
-			<path>Aircraft/A320-family/Sounds/leapx-sound.xml</path>
-		</sound>
-		<checklists include="A32X-Checklists.xml"/>
 		<description>Airbus A320-271N (PurePower 1127G)</description>
 		<flight-model>jsb</flight-model>
 		<aero>A320neo-PW</aero>
@@ -28,6 +23,10 @@
 			<model type="int">4</model>
 		</rating>
 		
+		<sound>
+			<path>Aircraft/A320-family/Sounds/leapx-sound.xml</path>
+		</sound>
+		
 		<previews>
 			<preview>
 				<type>exterior</type>
@@ -163,25 +162,17 @@
 			</config>
 		</view>
 		
-		<systems>
-      <wingflexer include="Systems/wingflexer-params.xml"/>
-      <property-rule n="100">
-        <name>wing flexer property rule</name>
-        <path>Aircraft/Generic/wingflexer.xml</path>
-      </property-rule>
-    </systems>
-		
 		<systems n="0">
-            <autopilot n="0"> <!-- Apparently PW PurePower uses N1, not EPR.... sooo I use CFM FADEC -->
-                <path>Aircraft/A320-family/Systems/fadec-cfm.xml</path>
-            </autopilot>
+			<autopilot n="0"> <!-- Apparently PW PurePower uses N1, not EPR.... sooo I use CFM FADEC -->
+				<path>Aircraft/A320-family/Systems/fadec-cfm.xml</path>
+			</autopilot>
 			<autopilot n="10">
 				<path>Aircraft/A320-family/Systems/leapx-sound.xml</path>
 			</autopilot>
 		</systems>
 
 	</sim>
-        
+		
 	<limits>
 		<mass-and-balance> <!--Data source: TCDS WV 55 -->
 			<maximum-takeoff-mass-lbs>174200</maximum-takeoff-mass-lbs>
diff --git a/A32X-Checklists.xml b/A32X-Checklists.xml
index 16c17794..f87f4a35 100644
--- a/A32X-Checklists.xml
+++ b/A32X-Checklists.xml
@@ -12,7 +12,7 @@
 			<value>COMPLETED(BOTH)</value>
 		</item>
 		<item>
-			<name>PINS AND COVERS</name>
+			<name>GEAR PINS AND COVERS</name>
 			<value>REMOVED</value>
 		</item>
 		<item>
@@ -66,7 +66,7 @@
 			</marker>
 		</item>
 		<item>
-			<name>WINDOWS and DOORS</name>      
+			<name>WINDOWS and DOORS</name>		
 			<value>CLOSED(BOTH)</value>
 			<marker>
 				<x-m>4.4658</x-m>
@@ -86,7 +86,7 @@
 			</marker>
 		</item>
 		<item>
-			<name>THR LEVERS</name>
+			<name>THRUST LEVERS</name>
 			<value>IDLE</value>
 			<marker>
 				<x-m>4.7200</x-m>
diff --git a/Models/A320-100-CFM.xml b/Models/A320-100-CFM.xml
index 36eef4bd..ab25da97 100644
--- a/Models/A320-100-CFM.xml
+++ b/Models/A320-100-CFM.xml
@@ -307,8 +307,8 @@
 
 	<!-- Tire smoke and spray effects -->
 	<model>
-	  <path>Aircraft/Generic/Effects/tyre-smoke-nose.xml</path>
-	  <name>tyre-smoke-n</name>
+		<path>Aircraft/Generic/Effects/tyre-smoke-nose.xml</path>
+		<name>tyre-smoke-n</name>
 		<offsets>
 			<x-m>7.83</x-m>
 			<y-m>0</y-m>
@@ -317,8 +317,8 @@
 	 </model>
 	 
 	<model>
-	  <path>Aircraft/Generic/Effects/tyre-smoke-port.xml</path>
-	  <name>tyre-smoke-p</name>
+		<path>Aircraft/Generic/Effects/tyre-smoke-port.xml</path>
+		<name>tyre-smoke-p</name>
 		<offsets>
 			<x-m>20.3180764</x-m>
 			<y-m>-3.795</y-m>
@@ -327,8 +327,8 @@
 	</model>
 	 
 	<model>
-	  <path>Aircraft/Generic/Effects/tyre-smoke-stbd.xml</path>
-	  <name>tyre-smoke-s</name>
+		<path>Aircraft/Generic/Effects/tyre-smoke-stbd.xml</path>
+		<name>tyre-smoke-s</name>
 		<offsets>
 			<x-m>20.3180764</x-m>
 			<y-m>3.795</y-m>
@@ -337,8 +337,8 @@
 	</model>
 	
 	<model>
-	  <path>Aircraft/Generic/Effects/rain-nose.xml</path>
-	  <name>rain-splash-n</name>
+		<path>Aircraft/Generic/Effects/rain-nose.xml</path>
+		<name>rain-splash-n</name>
 		<offsets>
 			<x-m>7.83</x-m>
 			<y-m>0</y-m>
@@ -347,8 +347,8 @@
 	</model>
 	
 	<model>
-	  <path>Aircraft/Generic/Effects/rain-port.xml</path>
-	  <name>rain-splash-p</name>
+		<path>Aircraft/Generic/Effects/rain-port.xml</path>
+		<name>rain-splash-p</name>
 		<offsets>
 			<x-m>20.3180764</x-m>
 			<y-m>-3.795</y-m>
@@ -357,8 +357,8 @@
 	</model>
 	 
 	<model>
-	  <path>Aircraft/Generic/Effects/rain-stbd.xml</path>
-	  <name>rain-splash-s</name>
+		<path>Aircraft/Generic/Effects/rain-stbd.xml</path>
+		<name>rain-splash-s</name>
 		<offsets>
 			<x-m>20.3180764</x-m>
 			<y-m>3.795</y-m>
@@ -367,33 +367,34 @@
 	</model>
 	
 	<model>
-	  <path>Aircraft/A320-family/Models/Effects/tire-smoke-left.xml</path>
-	  <name>tire-smoke-l</name>
-			<offsets>
-				<x-m>20.3180764</x-m>
-				<y-m>-3.795</y-m>
-				<z-m>-3.9669424</z-m>
-			</offsets>
+		<path>Aircraft/A320-family/Models/Effects/tire-smoke-left.xml</path>
+		<name>tire-smoke-l</name>
+		<offsets>
+			<x-m>20.3180764</x-m>
+			<y-m>-3.795</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
 	</model>
 	
 	<model>
-	  <path>Aircraft/A320-family/Models/Effects/tire-smoke-right.xml</path>
-	  <name>tire-smoke-r</name>
-			<offsets>
-				<x-m>20.3180764</x-m>
-				<y-m>3.795</y-m>
-				<z-m>-3.9669424</z-m>
-			</offsets>
+		<path>Aircraft/A320-family/Models/Effects/tire-smoke-right.xml</path>
+		<name>tire-smoke-r</name>
+		<offsets>
+			<x-m>20.3180764</x-m>
+			<y-m>3.795</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
 	</model>
-
+	
 	<!-- wing condensation effect -->
 	<model>
-	  <path>Aircraft/A320-family/Models/Effects/wing-condensation-L.xml</path>
-	  <name>wing-condensation</name>
+		<path>Aircraft/A320-family/Models/Effects/wing-condensation-L.xml</path>
+		<name>wing-condensation</name>
 	</model>
+	
 	<model>
-	  <path>Aircraft/A320-family/Models/Effects/wing-condensation-R.xml</path>
-	  <name>wing-condensation</name>
+		<path>Aircraft/A320-family/Models/Effects/wing-condensation-R.xml</path>
+		<name>wing-condensation</name>
 	</model>
 
 	<!-- Other non-aircraft models -->
@@ -407,41 +408,45 @@
 		</offsets>
 	</model>
 	
+	<model>
+		<path>Aircraft/Generic/marker.xml</path>
+	</model>
+	
 	<!-- Firetruck -->
 
 	<model>
-	 <name>Firetruck1</name>
-	 <path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
-	 <offsets>
-	  <x-m>60.0</x-m>
-	  <y-m>10.0</y-m>
-	  <z-m>-4.4</z-m>
-	 </offsets>
+		<name>Firetruck1</name>
+		<path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
+		<offsets>
+			<x-m>60.0</x-m>
+			<y-m>10.0</y-m>
+			<z-m>-4.4</z-m>
+		</offsets>
 	</model>
 	
 	<model>
-	 <name>Firetruck2</name>
-	 <path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
-	 <offsets>
-	  <x-m>80.0</x-m>
-	  <y-m>-8.0</y-m>
-	  <z-m>-4.4</z-m>
-	 </offsets>
+		<name>Firetruck2</name>
+		<path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
+		<offsets>
+			<x-m>80.0</x-m>
+			<y-m>-8.0</y-m>
+			<z-m>-4.4</z-m>
+		</offsets>
 	</model>
 	
 	<animation>
-	    <type>select</type>
-	    <object-name>Firetruck1</object-name>
-	    <object-name>Firetruck2</object-name>
-	    <condition>
-	        <and>
-	            <property>sim/animation/fire-services</property>
-	            <less-than>
-	                <property>velocities/groundspeed-kt</property>
-	                <value>40</value>
-	            </less-than>
-	        </and>
-	    </condition>
+		<type>select</type>
+		<object-name>Firetruck1</object-name>
+		<object-name>Firetruck2</object-name>
+		<condition>
+			<and>
+				<property>sim/animation/fire-services</property>
+				<less-than>
+					<property>velocities/groundspeed-kt</property>
+					<value>40</value>
+				</less-than>
+			</and>
+		</condition>
 	</animation>
 	
 	<!-- LIVERY SELECT -->
@@ -474,7 +479,7 @@
 		</unload>
 	</nasal>
 	
-	<!-- Ground Services -->    
+	<!-- Ground Services -->	
 	<model>
 		<name>ground_services</name>
 		<path>Aircraft/A320-family/Models/A320-groundservices.xml</path>
diff --git a/Models/A320-200-CFM.xml b/Models/A320-200-CFM.xml
index 57196a27..e371bf47 100644
--- a/Models/A320-200-CFM.xml
+++ b/Models/A320-200-CFM.xml
@@ -337,8 +337,8 @@
 
 	<!-- Tire smoke and spray effects -->
 	<model>
-	  <path>Aircraft/Generic/Effects/tyre-smoke-nose.xml</path>
-	  <name>tyre-smoke-n</name>
+		<path>Aircraft/Generic/Effects/tyre-smoke-nose.xml</path>
+		<name>tyre-smoke-n</name>
 		<offsets>
 			<x-m>7.83</x-m>
 			<y-m>0</y-m>
@@ -347,8 +347,8 @@
 	 </model>
 	 
 	<model>
-	  <path>Aircraft/Generic/Effects/tyre-smoke-port.xml</path>
-	  <name>tyre-smoke-p</name>
+		<path>Aircraft/Generic/Effects/tyre-smoke-port.xml</path>
+		<name>tyre-smoke-p</name>
 		<offsets>
 			<x-m>20.3180764</x-m>
 			<y-m>-3.795</y-m>
@@ -357,8 +357,8 @@
 	</model>
 	 
 	<model>
-	  <path>Aircraft/Generic/Effects/tyre-smoke-stbd.xml</path>
-	  <name>tyre-smoke-s</name>
+		<path>Aircraft/Generic/Effects/tyre-smoke-stbd.xml</path>
+		<name>tyre-smoke-s</name>
 		<offsets>
 			<x-m>20.3180764</x-m>
 			<y-m>3.795</y-m>
@@ -367,8 +367,8 @@
 	</model>
 	
 	<model>
-	  <path>Aircraft/Generic/Effects/rain-nose.xml</path>
-	  <name>rain-splash-n</name>
+		<path>Aircraft/Generic/Effects/rain-nose.xml</path>
+		<name>rain-splash-n</name>
 		<offsets>
 			<x-m>7.83</x-m>
 			<y-m>0</y-m>
@@ -377,8 +377,8 @@
 	</model>
 	
 	<model>
-	  <path>Aircraft/Generic/Effects/rain-port.xml</path>
-	  <name>rain-splash-p</name>
+		<path>Aircraft/Generic/Effects/rain-port.xml</path>
+		<name>rain-splash-p</name>
 		<offsets>
 			<x-m>20.3180764</x-m>
 			<y-m>-3.795</y-m>
@@ -387,8 +387,8 @@
 	</model>
 	 
 	<model>
-	  <path>Aircraft/Generic/Effects/rain-stbd.xml</path>
-	  <name>rain-splash-s</name>
+		<path>Aircraft/Generic/Effects/rain-stbd.xml</path>
+		<name>rain-splash-s</name>
 		<offsets>
 			<x-m>20.3180764</x-m>
 			<y-m>3.795</y-m>
@@ -397,33 +397,34 @@
 	</model>
 	
 	<model>
-	  <path>Aircraft/A320-family/Models/Effects/tire-smoke-left.xml</path>
-	  <name>tire-smoke-l</name>
-			<offsets>
-				<x-m>20.3180764</x-m>
-				<y-m>-3.795</y-m>
-				<z-m>-3.9669424</z-m>
-			</offsets>
+		<path>Aircraft/A320-family/Models/Effects/tire-smoke-left.xml</path>
+		<name>tire-smoke-l</name>
+		<offsets>
+			<x-m>20.3180764</x-m>
+			<y-m>-3.795</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
 	</model>
 	
 	<model>
-	  <path>Aircraft/A320-family/Models/Effects/tire-smoke-right.xml</path>
-	  <name>tire-smoke-r</name>
-			<offsets>
-				<x-m>20.3180764</x-m>
-				<y-m>3.795</y-m>
-				<z-m>-3.9669424</z-m>
-			</offsets>
+		<path>Aircraft/A320-family/Models/Effects/tire-smoke-right.xml</path>
+		<name>tire-smoke-r</name>
+		<offsets>
+			<x-m>20.3180764</x-m>
+			<y-m>3.795</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
 	</model>
 	
 	<!-- wing condensation effect -->
 	<model>
-	  <path>Aircraft/A320-family/Models/Effects/wing-condensation-L.xml</path>
-	  <name>wing-condensation</name>
+		<path>Aircraft/A320-family/Models/Effects/wing-condensation-L.xml</path>
+		<name>wing-condensation</name>
 	</model>
+	
 	<model>
-	  <path>Aircraft/A320-family/Models/Effects/wing-condensation-R.xml</path>
-	  <name>wing-condensation</name>
+		<path>Aircraft/A320-family/Models/Effects/wing-condensation-R.xml</path>
+		<name>wing-condensation</name>
 	</model>
 
 	<!-- Other non-aircraft models -->
@@ -437,41 +438,45 @@
 		</offsets>
 	</model>
 	
-	<!--Firetruck-->
+	<model>
+		<path>Aircraft/Generic/marker.xml</path>
+	</model>
+	
+	<!-- Firetruck -->
 
 	<model>
-	 <name>Firetruck1</name>
-	 <path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
-	 <offsets>
-	  <x-m>60.0</x-m>
-	  <y-m>10.0</y-m>
-	  <z-m>-4.4</z-m>
-	 </offsets>
+		<name>Firetruck1</name>
+		<path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
+		<offsets>
+			<x-m>60.0</x-m>
+			<y-m>10.0</y-m>
+			<z-m>-4.4</z-m>
+		</offsets>
 	</model>
 	
 	<model>
-	 <name>Firetruck2</name>
-	 <path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
-	 <offsets>
-	  <x-m>80.0</x-m>
-	  <y-m>-8.0</y-m>
-	  <z-m>-4.4</z-m>
-	 </offsets>
+		<name>Firetruck2</name>
+		<path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
+		<offsets>
+			<x-m>80.0</x-m>
+			<y-m>-8.0</y-m>
+			<z-m>-4.4</z-m>
+		</offsets>
 	</model>
 	
 	<animation>
-	    <type>select</type>
-	    <object-name>Firetruck1</object-name>
-	    <object-name>Firetruck2</object-name>
-	    <condition>
-	        <and>
-	            <property>sim/animation/fire-services</property>
-	            <less-than>
-	                <property>velocities/groundspeed-kt</property>
-	                <value>40</value>
-	            </less-than>
-	        </and>
-	    </condition>
+		<type>select</type>
+		<object-name>Firetruck1</object-name>
+		<object-name>Firetruck2</object-name>
+		<condition>
+			<and>
+				<property>sim/animation/fire-services</property>
+				<less-than>
+					<property>velocities/groundspeed-kt</property>
+					<value>40</value>
+				</less-than>
+			</and>
+		</condition>
 	</animation>
 	
 	<!-- LIVERY SELECT -->
@@ -504,7 +509,7 @@
 		</unload>
 	</nasal>
 	
-	<!-- Ground Services -->    
+	<!-- Ground Services -->	
 	<model>
 		<name>ground_services</name>
 		<path>Aircraft/A320-family/Models/A320-groundservices.xml</path>
diff --git a/Models/A320-200-IAE.xml b/Models/A320-200-IAE.xml
index 063ba11a..fcaa6c82 100644
--- a/Models/A320-200-IAE.xml
+++ b/Models/A320-200-IAE.xml
@@ -337,8 +337,8 @@
 
 	<!-- Tire smoke and spray effects -->
 	<model>
-	  <path>Aircraft/Generic/Effects/tyre-smoke-nose.xml</path>
-	  <name>tyre-smoke-n</name>
+		<path>Aircraft/Generic/Effects/tyre-smoke-nose.xml</path>
+		<name>tyre-smoke-n</name>
 		<offsets>
 			<x-m>7.83</x-m>
 			<y-m>0</y-m>
@@ -347,8 +347,8 @@
 	 </model>
 	 
 	<model>
-	  <path>Aircraft/Generic/Effects/tyre-smoke-port.xml</path>
-	  <name>tyre-smoke-p</name>
+		<path>Aircraft/Generic/Effects/tyre-smoke-port.xml</path>
+		<name>tyre-smoke-p</name>
 		<offsets>
 			<x-m>20.3180764</x-m>
 			<y-m>-3.795</y-m>
@@ -357,8 +357,8 @@
 	</model>
 	 
 	<model>
-	  <path>Aircraft/Generic/Effects/tyre-smoke-stbd.xml</path>
-	  <name>tyre-smoke-s</name>
+		<path>Aircraft/Generic/Effects/tyre-smoke-stbd.xml</path>
+		<name>tyre-smoke-s</name>
 		<offsets>
 			<x-m>20.3180764</x-m>
 			<y-m>3.795</y-m>
@@ -367,8 +367,8 @@
 	</model>
 	
 	<model>
-	  <path>Aircraft/Generic/Effects/rain-nose.xml</path>
-	  <name>rain-splash-n</name>
+		<path>Aircraft/Generic/Effects/rain-nose.xml</path>
+		<name>rain-splash-n</name>
 		<offsets>
 			<x-m>7.83</x-m>
 			<y-m>0</y-m>
@@ -377,8 +377,8 @@
 	</model>
 	
 	<model>
-	  <path>Aircraft/Generic/Effects/rain-port.xml</path>
-	  <name>rain-splash-p</name>
+		<path>Aircraft/Generic/Effects/rain-port.xml</path>
+		<name>rain-splash-p</name>
 		<offsets>
 			<x-m>20.3180764</x-m>
 			<y-m>-3.795</y-m>
@@ -387,8 +387,8 @@
 	</model>
 	 
 	<model>
-	  <path>Aircraft/Generic/Effects/rain-stbd.xml</path>
-	  <name>rain-splash-s</name>
+		<path>Aircraft/Generic/Effects/rain-stbd.xml</path>
+		<name>rain-splash-s</name>
 		<offsets>
 			<x-m>20.3180764</x-m>
 			<y-m>3.795</y-m>
@@ -397,35 +397,36 @@
 	</model>
 	
 	<model>
-	  <path>Aircraft/A320-family/Models/Effects/tire-smoke-left.xml</path>
-	  <name>tire-smoke-l</name>
-			<offsets>
-				<x-m>20.3180764</x-m>
-				<y-m>-3.795</y-m>
-				<z-m>-3.9669424</z-m>
-			</offsets>
+		<path>Aircraft/A320-family/Models/Effects/tire-smoke-left.xml</path>
+		<name>tire-smoke-l</name>
+		<offsets>
+			<x-m>20.3180764</x-m>
+			<y-m>-3.795</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
 	</model>
 	
 	<model>
-	  <path>Aircraft/A320-family/Models/Effects/tire-smoke-right.xml</path>
-	  <name>tire-smoke-r</name>
-			<offsets>
-				<x-m>20.3180764</x-m>
-				<y-m>3.795</y-m>
-				<z-m>-3.9669424</z-m>
-			</offsets>
+		<path>Aircraft/A320-family/Models/Effects/tire-smoke-right.xml</path>
+		<name>tire-smoke-r</name>
+		<offsets>
+			<x-m>20.3180764</x-m>
+			<y-m>3.795</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
 	</model>
 	
 	<!-- wing condensation effect -->
 	<model>
-	  <path>Aircraft/A320-family/Models/Effects/wing-condensation-L.xml</path>
-	  <name>wing-condensation</name>
-	</model>
-	<model>
-	  <path>Aircraft/A320-family/Models/Effects/wing-condensation-R.xml</path>
-	  <name>wing-condensation</name>
+		<path>Aircraft/A320-family/Models/Effects/wing-condensation-L.xml</path>
+		<name>wing-condensation</name>
 	</model>
 	
+	<model>
+		<path>Aircraft/A320-family/Models/Effects/wing-condensation-R.xml</path>
+		<name>wing-condensation</name>
+	</model>
+
 	<!-- Other non-aircraft models -->
 	<model>
 		<name>Pushback</name>
@@ -436,42 +437,46 @@
 			<z-m>-4.24</z-m>
 		</offsets>
 	</model>
-		
-	<!-- Firetruck -->
 	
 	<model>
-	 <name>Firetruck1</name>
-	 <path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
-	 <offsets>
-	  <x-m>60.0</x-m>
-	  <y-m>10.0</y-m>
-	  <z-m>-4.4</z-m>
-	 </offsets>
+		<path>Aircraft/Generic/marker.xml</path>
+	</model>
+	
+	<!-- Firetruck -->
+
+	<model>
+		<name>Firetruck1</name>
+		<path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
+		<offsets>
+			<x-m>60.0</x-m>
+			<y-m>10.0</y-m>
+			<z-m>-4.4</z-m>
+		</offsets>
 	</model>
 	
 	<model>
-	 <name>Firetruck2</name>
-	 <path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
-	 <offsets>
-	  <x-m>80.0</x-m>
-	  <y-m>-8.0</y-m>
-	  <z-m>-4.4</z-m>
-	 </offsets>
+		<name>Firetruck2</name>
+		<path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
+		<offsets>
+			<x-m>80.0</x-m>
+			<y-m>-8.0</y-m>
+			<z-m>-4.4</z-m>
+		</offsets>
 	</model>
 	
 	<animation>
-	    <type>select</type>
-	    <object-name>Firetruck1</object-name>
-	    <object-name>Firetruck2</object-name>
-	    <condition>
-	        <and>
-	            <property>sim/animation/fire-services</property>
-	            <less-than>
-	                <property>velocities/groundspeed-kt</property>
-	                <value>40</value>
-	            </less-than>
-	        </and>
-	    </condition>
+		<type>select</type>
+		<object-name>Firetruck1</object-name>
+		<object-name>Firetruck2</object-name>
+		<condition>
+			<and>
+				<property>sim/animation/fire-services</property>
+				<less-than>
+					<property>velocities/groundspeed-kt</property>
+					<value>40</value>
+				</less-than>
+			</and>
+		</condition>
 	</animation>
 	
 	<!-- LIVERY SELECT -->
@@ -504,7 +509,7 @@
 		</unload>
 	</nasal>
 	
-	<!-- Ground Services -->    
+	<!-- Ground Services -->	
 	<model>
 		<name>ground_services</name>
 		<path>Aircraft/A320-family/Models/A320-groundservices.xml</path>
diff --git a/Models/A320neo-CFM.xml b/Models/A320neo-CFM.xml
index 86a25869..6f06e17a 100644
--- a/Models/A320neo-CFM.xml
+++ b/Models/A320neo-CFM.xml
@@ -314,20 +314,20 @@
 		</offsets>
 	</model>
 
-<!-- Tire smoke and spray effects -->
+	<!-- Tire smoke and spray effects -->
 	<model>
-	  <path>Aircraft/Generic/Effects/tyre-smoke-nose.xml</path>
-	  <name>tyre-smoke-n</name>
+		<path>Aircraft/Generic/Effects/tyre-smoke-nose.xml</path>
+		<name>tyre-smoke-n</name>
 		<offsets>
 			<x-m>7.83</x-m>
 			<y-m>0</y-m>
 			<z-m>-3.9669424</z-m>
 		</offsets>
-	</model>
- 
+	 </model>
+	 
 	<model>
-	  <path>Aircraft/Generic/Effects/tyre-smoke-port.xml</path>
-	  <name>tyre-smoke-p</name>
+		<path>Aircraft/Generic/Effects/tyre-smoke-port.xml</path>
+		<name>tyre-smoke-p</name>
 		<offsets>
 			<x-m>20.3180764</x-m>
 			<y-m>-3.795</y-m>
@@ -336,8 +336,8 @@
 	</model>
 	 
 	<model>
-	  <path>Aircraft/Generic/Effects/tyre-smoke-stbd.xml</path>
-	  <name>tyre-smoke-s</name>
+		<path>Aircraft/Generic/Effects/tyre-smoke-stbd.xml</path>
+		<name>tyre-smoke-s</name>
 		<offsets>
 			<x-m>20.3180764</x-m>
 			<y-m>3.795</y-m>
@@ -346,8 +346,8 @@
 	</model>
 	
 	<model>
-	  <path>Aircraft/Generic/Effects/rain-nose.xml</path>
-	  <name>rain-splash-n</name>
+		<path>Aircraft/Generic/Effects/rain-nose.xml</path>
+		<name>rain-splash-n</name>
 		<offsets>
 			<x-m>7.83</x-m>
 			<y-m>0</y-m>
@@ -356,8 +356,8 @@
 	</model>
 	
 	<model>
-	  <path>Aircraft/Generic/Effects/rain-port.xml</path>
-	  <name>rain-splash-p</name>
+		<path>Aircraft/Generic/Effects/rain-port.xml</path>
+		<name>rain-splash-p</name>
 		<offsets>
 			<x-m>20.3180764</x-m>
 			<y-m>-3.795</y-m>
@@ -366,8 +366,8 @@
 	</model>
 	 
 	<model>
-	  <path>Aircraft/Generic/Effects/rain-stbd.xml</path>
-	  <name>rain-splash-s</name>
+		<path>Aircraft/Generic/Effects/rain-stbd.xml</path>
+		<name>rain-splash-s</name>
 		<offsets>
 			<x-m>20.3180764</x-m>
 			<y-m>3.795</y-m>
@@ -376,33 +376,34 @@
 	</model>
 	
 	<model>
-	  <path>Aircraft/A320-family/Models/Effects/tire-smoke-left.xml</path>
-	  <name>tire-smoke-l</name>
-			<offsets>
-				<x-m>20.3180764</x-m>
-				<y-m>-3.795</y-m>
-				<z-m>-3.9669424</z-m>
-			</offsets>
+		<path>Aircraft/A320-family/Models/Effects/tire-smoke-left.xml</path>
+		<name>tire-smoke-l</name>
+		<offsets>
+			<x-m>20.3180764</x-m>
+			<y-m>-3.795</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
 	</model>
 	
 	<model>
-	  <path>Aircraft/A320-family/Models/Effects/tire-smoke-right.xml</path>
-	  <name>tire-smoke-r</name>
-			<offsets>
-				<x-m>20.3180764</x-m>
-				<y-m>3.795</y-m>
-				<z-m>-3.9669424</z-m>
-			</offsets>
+		<path>Aircraft/A320-family/Models/Effects/tire-smoke-right.xml</path>
+		<name>tire-smoke-r</name>
+		<offsets>
+			<x-m>20.3180764</x-m>
+			<y-m>3.795</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
 	</model>
-
+	
 	<!-- wing condensation effect -->
 	<model>
-	  <path>Aircraft/A320-family/Models/Effects/wing-condensation-L.xml</path>
-	  <name>wing-condensation</name>
+		<path>Aircraft/A320-family/Models/Effects/wing-condensation-L.xml</path>
+		<name>wing-condensation</name>
 	</model>
+	
 	<model>
-	  <path>Aircraft/A320-family/Models/Effects/wing-condensation-R.xml</path>
-	  <name>wing-condensation</name>
+		<path>Aircraft/A320-family/Models/Effects/wing-condensation-R.xml</path>
+		<name>wing-condensation</name>
 	</model>
 
 	<!-- Other non-aircraft models -->
@@ -416,41 +417,45 @@
 		</offsets>
 	</model>
 	
+	<model>
+		<path>Aircraft/Generic/marker.xml</path>
+	</model>
+	
 	<!-- Firetruck -->
 
 	<model>
-	 <name>Firetruck1</name>
-	 <path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
-	 <offsets>
-	  <x-m>60.0</x-m>
-	  <y-m>10.0</y-m>
-	  <z-m>-4.4</z-m>
-	 </offsets>
+		<name>Firetruck1</name>
+		<path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
+		<offsets>
+			<x-m>60.0</x-m>
+			<y-m>10.0</y-m>
+			<z-m>-4.4</z-m>
+		</offsets>
 	</model>
 	
 	<model>
-	 <name>Firetruck2</name>
-	 <path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
-	 <offsets>
-	  <x-m>80.0</x-m>
-	  <y-m>-8.0</y-m>
-	  <z-m>-4.4</z-m>
-	 </offsets>
+		<name>Firetruck2</name>
+		<path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
+		<offsets>
+			<x-m>80.0</x-m>
+			<y-m>-8.0</y-m>
+			<z-m>-4.4</z-m>
+		</offsets>
 	</model>
 	
 	<animation>
-	    <type>select</type>
-	    <object-name>Firetruck1</object-name>
-	    <object-name>Firetruck2</object-name>
-	    <condition>
-	        <and>
-	            <property>sim/animation/fire-services</property>
-	            <less-than>
-	                <property>velocities/groundspeed-kt</property>
-	                <value>40</value>
-	            </less-than>
-	        </and>
-	    </condition>
+		<type>select</type>
+		<object-name>Firetruck1</object-name>
+		<object-name>Firetruck2</object-name>
+		<condition>
+			<and>
+				<property>sim/animation/fire-services</property>
+				<less-than>
+					<property>velocities/groundspeed-kt</property>
+					<value>40</value>
+				</less-than>
+			</and>
+		</condition>
 	</animation>
 	
 	<!-- LIVERY SELECT -->
@@ -483,7 +488,7 @@
 		</unload>
 	</nasal>
 	
-	<!-- Ground Services -->    
+	<!-- Ground Services -->	
 	<model>
 		<name>ground_services</name>
 		<path>Aircraft/A320-family/Models/A320-groundservices.xml</path>
diff --git a/Models/A320neo-PW.xml b/Models/A320neo-PW.xml
index 7d9b3fdf..4f22b32c 100644
--- a/Models/A320neo-PW.xml
+++ b/Models/A320neo-PW.xml
@@ -316,8 +316,8 @@
 
 	<!-- Tire smoke and spray effects -->
 	<model>
-	  <path>Aircraft/Generic/Effects/tyre-smoke-nose.xml</path>
-	  <name>tyre-smoke-n</name>
+		<path>Aircraft/Generic/Effects/tyre-smoke-nose.xml</path>
+		<name>tyre-smoke-n</name>
 		<offsets>
 			<x-m>7.83</x-m>
 			<y-m>0</y-m>
@@ -326,8 +326,8 @@
 	 </model>
 	 
 	<model>
-	  <path>Aircraft/Generic/Effects/tyre-smoke-port.xml</path>
-	  <name>tyre-smoke-p</name>
+		<path>Aircraft/Generic/Effects/tyre-smoke-port.xml</path>
+		<name>tyre-smoke-p</name>
 		<offsets>
 			<x-m>20.3180764</x-m>
 			<y-m>-3.795</y-m>
@@ -336,8 +336,8 @@
 	</model>
 	 
 	<model>
-	  <path>Aircraft/Generic/Effects/tyre-smoke-stbd.xml</path>
-	  <name>tyre-smoke-s</name>
+		<path>Aircraft/Generic/Effects/tyre-smoke-stbd.xml</path>
+		<name>tyre-smoke-s</name>
 		<offsets>
 			<x-m>20.3180764</x-m>
 			<y-m>3.795</y-m>
@@ -346,8 +346,8 @@
 	</model>
 	
 	<model>
-	  <path>Aircraft/Generic/Effects/rain-nose.xml</path>
-	  <name>rain-splash-n</name>
+		<path>Aircraft/Generic/Effects/rain-nose.xml</path>
+		<name>rain-splash-n</name>
 		<offsets>
 			<x-m>7.83</x-m>
 			<y-m>0</y-m>
@@ -356,8 +356,8 @@
 	</model>
 	
 	<model>
-	  <path>Aircraft/Generic/Effects/rain-port.xml</path>
-	  <name>rain-splash-p</name>
+		<path>Aircraft/Generic/Effects/rain-port.xml</path>
+		<name>rain-splash-p</name>
 		<offsets>
 			<x-m>20.3180764</x-m>
 			<y-m>-3.795</y-m>
@@ -366,8 +366,8 @@
 	</model>
 	 
 	<model>
-	  <path>Aircraft/Generic/Effects/rain-stbd.xml</path>
-	  <name>rain-splash-s</name>
+		<path>Aircraft/Generic/Effects/rain-stbd.xml</path>
+		<name>rain-splash-s</name>
 		<offsets>
 			<x-m>20.3180764</x-m>
 			<y-m>3.795</y-m>
@@ -376,33 +376,34 @@
 	</model>
 	
 	<model>
-	  <path>Aircraft/A320-family/Models/Effects/tire-smoke-left.xml</path>
-	  <name>tire-smoke-l</name>
-			<offsets>
-				<x-m>20.3180764</x-m>
-				<y-m>-3.795</y-m>
-				<z-m>-3.9669424</z-m>
-			</offsets>
+		<path>Aircraft/A320-family/Models/Effects/tire-smoke-left.xml</path>
+		<name>tire-smoke-l</name>
+		<offsets>
+			<x-m>20.3180764</x-m>
+			<y-m>-3.795</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
 	</model>
 	
 	<model>
-	  <path>Aircraft/A320-family/Models/Effects/tire-smoke-right.xml</path>
-	  <name>tire-smoke-r</name>
-			<offsets>
-				<x-m>20.3180764</x-m>
-				<y-m>3.795</y-m>
-				<z-m>-3.9669424</z-m>
-			</offsets>
+		<path>Aircraft/A320-family/Models/Effects/tire-smoke-right.xml</path>
+		<name>tire-smoke-r</name>
+		<offsets>
+			<x-m>20.3180764</x-m>
+			<y-m>3.795</y-m>
+			<z-m>-3.9669424</z-m>
+		</offsets>
 	</model>
 	
 	<!-- wing condensation effect -->
 	<model>
-	  <path>Aircraft/A320-family/Models/Effects/wing-condensation-L.xml</path>
-	  <name>wing-condensation</name>
+		<path>Aircraft/A320-family/Models/Effects/wing-condensation-L.xml</path>
+		<name>wing-condensation</name>
 	</model>
+	
 	<model>
-	  <path>Aircraft/A320-family/Models/Effects/wing-condensation-R.xml</path>
-	  <name>wing-condensation</name>
+		<path>Aircraft/A320-family/Models/Effects/wing-condensation-R.xml</path>
+		<name>wing-condensation</name>
 	</model>
 
 	<!-- Other non-aircraft models -->
@@ -416,41 +417,45 @@
 		</offsets>
 	</model>
 	
+	<model>
+		<path>Aircraft/Generic/marker.xml</path>
+	</model>
+	
 	<!-- Firetruck -->
 
 	<model>
-	 <name>Firetruck1</name>
-	 <path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
-	 <offsets>
-	  <x-m>60.0</x-m>
-	  <y-m>10.0</y-m>
-	  <z-m>-4.4</z-m>
-	 </offsets>
+		<name>Firetruck1</name>
+		<path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
+		<offsets>
+			<x-m>60.0</x-m>
+			<y-m>10.0</y-m>
+			<z-m>-4.4</z-m>
+		</offsets>
 	</model>
 	
 	<model>
-	 <name>Firetruck2</name>
-	 <path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
-	 <offsets>
-	  <x-m>80.0</x-m>
-	  <y-m>-8.0</y-m>
-	  <z-m>-4.4</z-m>
-	 </offsets>
+		<name>Firetruck2</name>
+		<path>Models/Airport/Vehicle/hoskosh-ti-1500.ac</path>
+		<offsets>
+			<x-m>80.0</x-m>
+			<y-m>-8.0</y-m>
+			<z-m>-4.4</z-m>
+		</offsets>
 	</model>
 	
 	<animation>
-	    <type>select</type>
-	    <object-name>Firetruck1</object-name>
-	    <object-name>Firetruck2</object-name>
-	    <condition>
-	        <and>
-	            <property>sim/animation/fire-services</property>
-	            <less-than>
-	                <property>velocities/groundspeed-kt</property>
-	                <value>40</value>
-	            </less-than>
-	        </and>
-	    </condition>
+		<type>select</type>
+		<object-name>Firetruck1</object-name>
+		<object-name>Firetruck2</object-name>
+		<condition>
+			<and>
+				<property>sim/animation/fire-services</property>
+				<less-than>
+					<property>velocities/groundspeed-kt</property>
+					<value>40</value>
+				</less-than>
+			</and>
+		</condition>
 	</animation>
 	
 	<!-- LIVERY SELECT -->
@@ -490,7 +495,7 @@
 		</unload>
 	</nasal>
 	
-	<!-- Ground Services -->    
+	<!-- Ground Services -->	
 	<model>
 		<name>ground_services</name>
 		<path>Aircraft/A320-family/Models/A320-groundservices.xml</path>