diff --git a/solution/solution.tsproj b/solution/solution.tsproj
index 729ffe6..32519b0 100644
--- a/solution/solution.tsproj
+++ b/solution/solution.tsproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<TcSmProject xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4024.0">
+<TcSmProject xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4022.30">
 	<DataTypes>
 		<DataType>
 			<Name GUID="{4C3FC5AC-D5AA-44C6-AC5A-159774BA0F6D}" Namespace="MC" TcBaseType="true" HideType="true" IecDeclaration="DWORD;">NCTOPLC_AXIS_REF_STATE</Name>
@@ -411,7 +411,8 @@
 			<SubItem>
 				<Name>AxisState</Name>
 				<Type GUID="{18071995-0000-0000-0000-000000000008}">UDINT</Type>
-				<Comment><![CDATA[Present State Of The Axis Movement (continuous axis):
+				<Comment>
+					<![CDATA[Present State Of The Axis Movement (continuous axis):
 0  = INACTIVE:		axis has no job
 1  = RUNNING:		axis is executing a motion job
 2  = OVERRIDE_ZERO:	axis is executing a job but override is zero
@@ -425,7 +426,8 @@ Slaves only:
 External Setpoint Generation:
 41 = EXTSETGEN_MODE1:	external setpoint generation active
 42 = EXTSETGEN_MODE2:	internal and external setpoint gen. active
-]]></Comment>
+]]>
+				</Comment>
 				<BitSize>32</BitSize>
 				<BitOffs>64</BitOffs>
 			</SubItem>
@@ -438,7 +440,8 @@ External Setpoint Generation:
 			<SubItem>
 				<Name>HomingState</Name>
 				<Type GUID="{18071995-0000-0000-0000-000000000008}">UDINT</Type>
-				<Comment><![CDATA[Axis Homing Status:
+				<Comment>
+					<![CDATA[Axis Homing Status:
 0: idle
 1: start homing
 2: searching home switch
@@ -446,19 +449,22 @@ External Setpoint Generation:
 4: moving off home switch
 5: searching sync pulse
 6: stopping after homing
-]]></Comment>
+]]>
+				</Comment>
 				<BitSize>32</BitSize>
 				<BitOffs>128</BitOffs>
 			</SubItem>
 			<SubItem>
 				<Name>CoupleState</Name>
 				<Type GUID="{18071995-0000-0000-0000-000000000008}">UDINT</Type>
-				<Comment><![CDATA[Axis Coupling Status:
+				<Comment>
+					<![CDATA[Axis Coupling Status:
 0: axis is a single axis (not coupled)
 1: axis is a master axis
 2: axis is master and slave
 3: axis is a slave axis
-]]></Comment>
+]]>
+				</Comment>
 				<BitSize>32</BitSize>
 				<BitOffs>160</BitOffs>
 			</SubItem>
@@ -684,13 +690,13 @@ External Setpoint Generation:
 					<Type GUID="{F794B740-82D7-4637-848E-4F74A711D038}">NCAXLESTRUCT_TOPLC4</Type>
 				</Relation>
 				<Relation Priority="100">
-					<Type GUID="{40BD39B0-C3EA-4F74-9F4F-5F1982786F7C}"></Type>
+					<Type GUID="{40BD39B0-C3EA-4F74-9F4F-5F1982786F7C}"/>
 				</Relation>
 				<Relation Priority="100">
-					<Type GUID="{40BD39B2-C3EA-4F74-9F4F-5F1982786F7C}"></Type>
+					<Type GUID="{40BD39B2-C3EA-4F74-9F4F-5F1982786F7C}"/>
 				</Relation>
 				<Relation Priority="100">
-					<Type GUID="{8CDE0C45-AB9D-42DB-BC94-1CF7521AB268}"></Type>
+					<Type GUID="{8CDE0C45-AB9D-42DB-BC94-1CF7521AB268}"/>
 				</Relation>
 			</Relations>
 		</DataType>
@@ -873,7 +879,7 @@ External Setpoint Generation:
 			</Relations>
 		</DataType>
 	</DataTypes>
-	<Project ProjectGUID="{9CF97348-B9D3-4938-B1F2-5F0B0B6AA66A}" Target64Bit="true" ShowHideConfigurations="#x106">
+	<Project ProjectGUID="{9CF97348-B9D3-4938-B1F2-5F0B0B6AA66A}" TargetNetId="5.54.104.144.1.1" Target64Bit="true" ShowHideConfigurations="#x106">
 		<System>
 			<Licenses>
 				<Target>
@@ -907,22 +913,30 @@ External Setpoint Generation:
 						<Name>PlcTask Inputs</Name>
 						<Var>
 							<Name>GVL.axes[1].inputs.bLimitFwd</Name>
-							<Comment><![CDATA[////Axis Inputs///////]]></Comment>
+							<Comment>
+								<![CDATA[////Axis Inputs///////]]>
+							</Comment>
 							<Type>BOOL</Type>
 						</Var>
 						<Var>
 							<Name>GVL.axes[1].inputs.bLimitBwd</Name>
-							<Comment><![CDATA[Backward limit switch]]></Comment>
+							<Comment>
+								<![CDATA[Backward limit switch]]>
+							</Comment>
 							<Type>BOOL</Type>
 						</Var>
 						<Var>
 							<Name>GVL.axes[1].inputs.bHomeSensor</Name>
-							<Comment><![CDATA[Reference siganl for homing]]></Comment>
+							<Comment>
+								<![CDATA[Reference siganl for homing]]>
+							</Comment>
 							<Type>BOOL</Type>
 						</Var>
 						<Var>
 							<Name>GVL.axes[1].inputs.bEncLAtch</Name>
-							<Comment><![CDATA[Reference index signal from inc. enconder]]></Comment>
+							<Comment>
+								<![CDATA[Reference index signal from inc. enconder]]>
+							</Comment>
 							<Type>BOOL</Type>
 						</Var>
 						<Var>
@@ -930,7 +944,8 @@ External Setpoint Generation:
 							<Type GUID="{6A65C767-34E5-42BF-AD87-E1A503EAC7BE}" Namespace="MC">NCTOPLC_AXIS_REF</Type>
 							<SubVar>
 								<Name>AxisState</Name>
-								<Comment><![CDATA[Present State Of The Axis Movement (continuous axis):
+								<Comment>
+									<![CDATA[Present State Of The Axis Movement (continuous axis):
 0  = INACTIVE:		axis has no job
 1  = RUNNING:		axis is executing a motion job
 2  = OVERRIDE_ZERO:	axis is executing a job but override is zero
@@ -944,11 +959,13 @@ Slaves only:
 External Setpoint Generation:
 41 = EXTSETGEN_MODE1:	external setpoint generation active
 42 = EXTSETGEN_MODE2:	internal and external setpoint gen. active
-]]></Comment>
+]]>
+								</Comment>
 							</SubVar>
 							<SubVar>
 								<Name>HomingState</Name>
-								<Comment><![CDATA[Axis Homing Status:
+								<Comment>
+									<![CDATA[Axis Homing Status:
 0: idle
 1: start homing
 2: searching home switch
@@ -956,36 +973,47 @@ External Setpoint Generation:
 4: moving off home switch
 5: searching sync pulse
 6: stopping after homing
-]]></Comment>
+]]>
+								</Comment>
 							</SubVar>
 							<SubVar>
 								<Name>CoupleState</Name>
-								<Comment><![CDATA[Axis Coupling Status:
+								<Comment>
+									<![CDATA[Axis Coupling Status:
 0: axis is a single axis (not coupled)
 1: axis is a master axis
 2: axis is master and slave
 3: axis is a slave axis
-]]></Comment>
+]]>
+								</Comment>
 							</SubVar>
 						</Var>
 						<Var>
 							<Name>GVL.axes[2].inputs.bLimitFwd</Name>
-							<Comment><![CDATA[////Axis Inputs///////]]></Comment>
+							<Comment>
+								<![CDATA[////Axis Inputs///////]]>
+							</Comment>
 							<Type>BOOL</Type>
 						</Var>
 						<Var>
 							<Name>GVL.axes[2].inputs.bLimitBwd</Name>
-							<Comment><![CDATA[Backward limit switch]]></Comment>
+							<Comment>
+								<![CDATA[Backward limit switch]]>
+							</Comment>
 							<Type>BOOL</Type>
 						</Var>
 						<Var>
 							<Name>GVL.axes[2].inputs.bHomeSensor</Name>
-							<Comment><![CDATA[Reference siganl for homing]]></Comment>
+							<Comment>
+								<![CDATA[Reference siganl for homing]]>
+							</Comment>
 							<Type>BOOL</Type>
 						</Var>
 						<Var>
 							<Name>GVL.axes[2].inputs.bEncLAtch</Name>
-							<Comment><![CDATA[Reference index signal from inc. enconder]]></Comment>
+							<Comment>
+								<![CDATA[Reference index signal from inc. enconder]]>
+							</Comment>
 							<Type>BOOL</Type>
 						</Var>
 						<Var>
@@ -993,7 +1021,8 @@ External Setpoint Generation:
 							<Type GUID="{6A65C767-34E5-42BF-AD87-E1A503EAC7BE}" Namespace="MC">NCTOPLC_AXIS_REF</Type>
 							<SubVar>
 								<Name>AxisState</Name>
-								<Comment><![CDATA[Present State Of The Axis Movement (continuous axis):
+								<Comment>
+									<![CDATA[Present State Of The Axis Movement (continuous axis):
 0  = INACTIVE:		axis has no job
 1  = RUNNING:		axis is executing a motion job
 2  = OVERRIDE_ZERO:	axis is executing a job but override is zero
@@ -1007,11 +1036,13 @@ Slaves only:
 External Setpoint Generation:
 41 = EXTSETGEN_MODE1:	external setpoint generation active
 42 = EXTSETGEN_MODE2:	internal and external setpoint gen. active
-]]></Comment>
+]]>
+								</Comment>
 							</SubVar>
 							<SubVar>
 								<Name>HomingState</Name>
-								<Comment><![CDATA[Axis Homing Status:
+								<Comment>
+									<![CDATA[Axis Homing Status:
 0: idle
 1: start homing
 2: searching home switch
@@ -1019,36 +1050,47 @@ External Setpoint Generation:
 4: moving off home switch
 5: searching sync pulse
 6: stopping after homing
-]]></Comment>
+]]>
+								</Comment>
 							</SubVar>
 							<SubVar>
 								<Name>CoupleState</Name>
-								<Comment><![CDATA[Axis Coupling Status:
+								<Comment>
+									<![CDATA[Axis Coupling Status:
 0: axis is a single axis (not coupled)
 1: axis is a master axis
 2: axis is master and slave
 3: axis is a slave axis
-]]></Comment>
+]]>
+								</Comment>
 							</SubVar>
 						</Var>
 						<Var>
 							<Name>GVL.axes[3].inputs.bLimitFwd</Name>
-							<Comment><![CDATA[////Axis Inputs///////]]></Comment>
+							<Comment>
+								<![CDATA[////Axis Inputs///////]]>
+							</Comment>
 							<Type>BOOL</Type>
 						</Var>
 						<Var>
 							<Name>GVL.axes[3].inputs.bLimitBwd</Name>
-							<Comment><![CDATA[Backward limit switch]]></Comment>
+							<Comment>
+								<![CDATA[Backward limit switch]]>
+							</Comment>
 							<Type>BOOL</Type>
 						</Var>
 						<Var>
 							<Name>GVL.axes[3].inputs.bHomeSensor</Name>
-							<Comment><![CDATA[Reference siganl for homing]]></Comment>
+							<Comment>
+								<![CDATA[Reference siganl for homing]]>
+							</Comment>
 							<Type>BOOL</Type>
 						</Var>
 						<Var>
 							<Name>GVL.axes[3].inputs.bEncLAtch</Name>
-							<Comment><![CDATA[Reference index signal from inc. enconder]]></Comment>
+							<Comment>
+								<![CDATA[Reference index signal from inc. enconder]]>
+							</Comment>
 							<Type>BOOL</Type>
 						</Var>
 						<Var>
@@ -1056,7 +1098,8 @@ External Setpoint Generation:
 							<Type GUID="{6A65C767-34E5-42BF-AD87-E1A503EAC7BE}" Namespace="MC">NCTOPLC_AXIS_REF</Type>
 							<SubVar>
 								<Name>AxisState</Name>
-								<Comment><![CDATA[Present State Of The Axis Movement (continuous axis):
+								<Comment>
+									<![CDATA[Present State Of The Axis Movement (continuous axis):
 0  = INACTIVE:		axis has no job
 1  = RUNNING:		axis is executing a motion job
 2  = OVERRIDE_ZERO:	axis is executing a job but override is zero
@@ -1070,11 +1113,13 @@ Slaves only:
 External Setpoint Generation:
 41 = EXTSETGEN_MODE1:	external setpoint generation active
 42 = EXTSETGEN_MODE2:	internal and external setpoint gen. active
-]]></Comment>
+]]>
+								</Comment>
 							</SubVar>
 							<SubVar>
 								<Name>HomingState</Name>
-								<Comment><![CDATA[Axis Homing Status:
+								<Comment>
+									<![CDATA[Axis Homing Status:
 0: idle
 1: start homing
 2: searching home switch
@@ -1082,16 +1127,19 @@ External Setpoint Generation:
 4: moving off home switch
 5: searching sync pulse
 6: stopping after homing
-]]></Comment>
+]]>
+								</Comment>
 							</SubVar>
 							<SubVar>
 								<Name>CoupleState</Name>
-								<Comment><![CDATA[Axis Coupling Status:
+								<Comment>
+									<![CDATA[Axis Coupling Status:
 0: axis is a single axis (not coupled)
 1: axis is a master axis
 2: axis is master and slave
 3: axis is a slave axis
-]]></Comment>
+]]>
+								</Comment>
 							</SubVar>
 						</Var>
 					</Vars>
@@ -1099,7 +1147,9 @@ External Setpoint Generation:
 						<Name>PlcTask Outputs</Name>
 						<Var>
 							<Name>MAIN.bOutput1</Name>
-							<Comment><![CDATA[*****Outputs: Power for Limit switches and Home Sensors (every 4th output)*******]]></Comment>
+							<Comment>
+								<![CDATA[*****Outputs: Power for Limit switches and Home Sensors (every 4th output)*******]]>
+							</Comment>
 							<Type>BOOL</Type>
 						</Var>
 						<Var>