diff --git a/TcMatrix/TcMatrix/POUs/Array2DStaticMatrix.TcPOU b/TcMatrix/TcMatrix/POUs/Array2DStaticMatrix.TcPOU
index 1aab141..06d3330 100644
--- a/TcMatrix/TcMatrix/POUs/Array2DStaticMatrix.TcPOU
+++ b/TcMatrix/TcMatrix/POUs/Array2DStaticMatrix.TcPOU
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.9">
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4026.11">
   <POU Name="Array2DStaticMatrix" Id="{a6eb7602-4f25-0098-0e69-1891a5e44e4f}" SpecialFunc="None">
-    <Declaration><![CDATA[(*
-Derived Matrix FB that wraps a provided 2D array of LREALS into an invariantly sized matrix
-*)
+    <Declaration><![CDATA[/// Derived Matrix FB that wraps a provided 2D array of LREALS into an invariantly sized matrix
 {attribute 'reflection'}
 {attribute 'no_assign'}
 FUNCTION_BLOCK Array2DStaticMatrix EXTENDS StaticMatrix
-VAR_INPUT
-END_VAR
-VAR_OUTPUT
-END_VAR
 VAR
 	R0 : DINT;
 	C0 : DINT;
@@ -25,14 +19,14 @@ Init_(Array2D_Rows(Data),Array2D_Cols(Data));]]></ST>
     </Implementation>
     <Folder Name="Overrides" Id="{6fc454d7-7110-0aab-201f-31ae3ea4054e}" />
     <Method Name="GetI" Id="{ad4aff6f-ab24-028f-3c4b-cbe7797bb10d}" FolderPath="Overrides\">
-      <Declaration><![CDATA[//Gets the value of the element in this matrix at the supplied location as if the elements were stored in a 1D row-major array
-//:Prerequisites:
-// - 0 <= I < Rows*Cols
-// - Matrix is not empty
-//If the supplied index is out of bounds the value 0 is returned and a warning is generated in the Error List
-METHOD PUBLIC GetI : LREAL//The value of the element at the specified index, or 0 if an invalid index is supplied
+      <Declaration><![CDATA[/// Gets the value of the element in this matrix at the supplied location as if the elements were stored in a 1D row-major array
+/// Prerequisites
+/// - 0 <= I < Rows*Cols
+/// - Matrix is not empty
+/// If the supplied index is out of bounds the value 0 is returned and a warning is generated in the Error List
+METHOD PUBLIC GetI : LREAL //< The value of the element at the specified index, or 0 if an invalid index is supplied
 VAR_INPUT
-	I : UINT;//The index of the element which should have its value returned
+	I : UINT; //< The index of the element which should have its value returned
 END_VAR
 VAR
 	Ri : UINT;
@@ -57,12 +51,12 @@ END_IF]]></ST>
       </Implementation>
     </Method>
     <Method Name="SetI" Id="{d3833573-b0e3-0a5b-0936-52509088aeb3}" FolderPath="Overrides\">
-      <Declaration><![CDATA[//Sets the element specified by the supplied index to the suppleid value, assuming the data of the matrix is stored in a 1D row-major array
-//:Prerequisites: - 0 <= I < Rows*Cols
-METHOD PUBLIC SetI : BOOL//TRUE if the specified index is valid and the data is copied. FLASE otherwise
+      <Declaration><![CDATA[/// Sets the element specified by the supplied index to the suppleid value, assuming the data of the matrix is stored in a 1D row-major array
+/// Prerequisites - 0 <= I < Rows*Cols
+METHOD PUBLIC SetI : BOOL //< TRUE if the specified index is valid and the data is copied. FLASE otherwise
 VAR_INPUT
-	I : UINT;//The index specifying which element should be modified
-	Val : LREAL;//The value copied to the corresponding element
+	I : UINT; //< The index specifying which element should be modified
+	Val : LREAL; //< The value copied to the corresponding element
 END_VAR
 VAR
 	Ri : UINT;
diff --git a/TcMatrix/TcMatrix/POUs/Csv/MatrixCsvReader.TcPOU b/TcMatrix/TcMatrix/POUs/Csv/MatrixCsvReader.TcPOU
index 06e648e..ba10c67 100644
--- a/TcMatrix/TcMatrix/POUs/Csv/MatrixCsvReader.TcPOU
+++ b/TcMatrix/TcMatrix/POUs/Csv/MatrixCsvReader.TcPOU
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.9">
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4026.11">
   <POU Name="MatrixCsvReader" Id="{57e330de-3a6c-0c50-1c55-a24f6c132b53}" SpecialFunc="None">
     <Declaration><![CDATA[FUNCTION_BLOCK MatrixCsvReader
 VAR_IN_OUT CONSTANT
@@ -8,8 +8,8 @@ END_VAR
 VAR_INPUT
 	bExecute : BOOL;
 	sPathName : T_MaxString;
-	tTimeout : TIME;//timeout applied indidivudally to each file operation
-	nHeaderLines : UDINT;//number of lines to skip at the beginning
+	tTimeout : TIME; //< timeout applied indidivudally to each file operation
+	nHeaderLines : UDINT; //< number of lines to skip at the beginning
 END_VAR
 VAR_OUTPUT
 	bBusy : BOOL;
diff --git a/TcMatrix/TcMatrix/POUs/Csv/MatrixCsvWriter.TcPOU b/TcMatrix/TcMatrix/POUs/Csv/MatrixCsvWriter.TcPOU
index 05ad110..cce1ff3 100644
--- a/TcMatrix/TcMatrix/POUs/Csv/MatrixCsvWriter.TcPOU
+++ b/TcMatrix/TcMatrix/POUs/Csv/MatrixCsvWriter.TcPOU
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.9">
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4026.11">
   <POU Name="MatrixCsvWriter" Id="{b9c4277f-dd1d-07b9-250c-5d70c700e57b}" SpecialFunc="None">
     <Declaration><![CDATA[FUNCTION_BLOCK MatrixCsvWriter
 VAR_IN_OUT
@@ -7,8 +7,8 @@ VAR_IN_OUT
 END_VAR
 VAR_INPUT
 	bExecute : BOOL;
-	sPathName : T_MaxString;
-	tTimeout : TIME;//timeout applied indidivudally to each file operation
+	sPathName : Tc2_System.T_MaxString;
+	tTimeout : TIME; //< timeout applied indidivudally to each file operation
 	pHeader : POINTER TO STRING;
 	cbHeaderLen : UDINT;
 END_VAR
@@ -19,10 +19,10 @@ VAR_OUTPUT
 	nErrStep : UDINT;
 END_VAR
 VAR
-	FileOpen : FB_FileOpen;
-	CsvWrite : FB_CSVMemBufferWriter;
-	FileWrite : FB_FileWrite;
-	FileClose : FB_FileClose;
+	FileOpen : Tc2_System.FB_FileOpen;
+	CsvWrite : Tc2_Utilities.FB_CSVMemBufferWriter;
+	FileWrite : Tc2_System.FB_FileWrite;
+	FileClose : Tc2_System.FB_FileClose;
 	
 	hFile : UINT;
 	buffer : STRING(bufferSize+1);
@@ -31,7 +31,7 @@ VAR
 	
 	Ri : UINT;
 	Ci : UINT;
-	BuffCmd : E_EnumCmdType;
+	BuffCmd : Tc2_Utilities.E_EnumCmdType;
 END_VAR
 VAR CONSTANT
 	bufferSize : UDINT := 1024;
diff --git a/TcMatrix/TcMatrix/POUs/DynamicMatrix.TcPOU b/TcMatrix/TcMatrix/POUs/DynamicMatrix.TcPOU
index d3cd778..e4cbe8b 100644
--- a/TcMatrix/TcMatrix/POUs/DynamicMatrix.TcPOU
+++ b/TcMatrix/TcMatrix/POUs/DynamicMatrix.TcPOU
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.9">
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4026.11">
   <POU Name="DynamicMatrix" Id="{48b9f1ca-1ace-0f6f-3081-31a18046958e}" SpecialFunc="None">
     <Declaration><![CDATA[{attribute 'no_assign'}
 {attribute 'reflection'}
 FUNCTION_BLOCK DynamicMatrix EXTENDS Matrix
-VAR_INPUT
-END_VAR
-VAR_OUTPUT
-END_VAR
 VAR
 	Rows_ : UINT := 0;
 	Cols_ : UINT := 0;
 	
-	Data : POINTER TO LREAL;//1D array of reals, such that I = F(R,C) = R*Cols + C (row-major)
+	Data : POINTER TO LREAL; // 1D array of reals, such that I = F(R,C) = R*Cols + C (row-major)
 	
 	MemManager : FB_DynMem_Manager2;
 END_VAR
@@ -26,7 +22,7 @@ END_VAR
     <Folder Name="Overrides" Id="{78694c69-7fc5-08cd-0afe-6c21638c5b6b}" />
     <Folder Name="Resultants" Id="{e9cc64b5-17e3-05cb-0547-28b67d88aa8b}" />
     <Method Name="AsColVector" Id="{8333982d-97ec-03df-25f4-b8160437c221}" FolderPath="Resultants\">
-      <Declaration><![CDATA[//Resets the content of this matrix to be a column vector, copied from the specified column of the input matrix
+      <Declaration><![CDATA[/// Resets the content of this matrix to be a column vector, copied from the specified column of the input matrix
 METHOD PUBLIC AsColVector : BOOL
 VAR_IN_OUT CONSTANT
 	M : Matrix;
@@ -46,7 +42,7 @@ END_VAR
       </Implementation>
     </Method>
     <Method Name="AsElementDifference" Id="{6b700784-8326-0bcf-2c9d-ca6331de219c}" FolderPath="Resultants\">
-      <Declaration><![CDATA[//resets the content of this matrix to be the result of subtracting the input subtrahend matrix from the input minuend matrix element by element
+      <Declaration><![CDATA[/// Resets the content of this matrix to be the result of subtracting the input subtrahend matrix from the input minuend matrix element by element
 METHOD PUBLIC AsElementDifference : BOOL
 VAR_IN_OUT CONSTANT
 	Minuend : Matrix;
@@ -68,7 +64,7 @@ AsElementDifference := Matrix_ElementSum(Minuend,Subtrahend,THIS^);]]></ST>
       </Implementation>
     </Method>
     <Method Name="AsElementProduct" Id="{1d639892-7279-0584-2a80-52cd430c8d25}" FolderPath="Resultants\">
-      <Declaration><![CDATA[//resets the content of this matrix to be the result of multiplying the input matricies element by element
+      <Declaration><![CDATA[/// Resets the content of this matrix to be the result of multiplying the input matricies element by element
 METHOD PUBLIC AsElementProduct : BOOL
 VAR_IN_OUT CONSTANT
 	A : Matrix;
@@ -90,7 +86,7 @@ AsElementProduct := Matrix_ElementProduct(A,B,THIS^);]]></ST>
       </Implementation>
     </Method>
     <Method Name="AsElementSum" Id="{1ed69aa6-4c59-063d-134e-146775a583ed}" FolderPath="Resultants\">
-      <Declaration><![CDATA[//resets the content of this matrix to be the result of adding the input matricies element by element
+      <Declaration><![CDATA[/// Resets the content of this matrix to be the result of adding the input matricies element by element
 METHOD PUBLIC AsElementSum : BOOL
 VAR_IN_OUT CONSTANT
 	A : Matrix;
@@ -112,7 +108,7 @@ AsElementSum := Matrix_ElementSum(A,B,THIS^);]]></ST>
       </Implementation>
     </Method>
     <Method Name="AsGrown" Id="{3cd3cf6d-f6c0-085c-3642-2ba18a0c7d35}" FolderPath="Resultants\">
-      <Declaration><![CDATA[//resets the content of this matrix to be a larger (by one row and one column) matrix copy of the input matrix. Initial values of the new row, column, and diagonal are controlled by other inputs.
+      <Declaration><![CDATA[/// Resets the content of this matrix to be a larger (by one row and one column) matrix copy of the input matrix. Initial values of the new row, column, and diagonal are controlled by other inputs.
 METHOD PUBLIC AsGrown : BOOL
 VAR_IN_OUT CONSTANT
 	M : Matrix;
@@ -136,7 +132,7 @@ AsGrown := Matrix_Grow(M,THIS^,Row,Col,DiagVal,RowVal,ColVal);]]></ST>
       </Implementation>
     </Method>
     <Method Name="AsInverse" Id="{fffae31c-4722-0c74-25e1-98f5de4d08c5}" FolderPath="Resultants\">
-      <Declaration><![CDATA[//resets the contents of this matrix to be the inverse of the input matrix.
+      <Declaration><![CDATA[/// Resets the contents of this matrix to be the inverse of the input matrix.
 METHOD PUBLIC AsInverse : BOOL
 VAR_IN_OUT CONSTANT
 	M : Matrix;
@@ -157,7 +153,7 @@ AsInverse := THIS^.InvertSquare(Tolerance);]]></ST>
       </Implementation>
     </Method>
     <Method Name="AsMatrixProduct" Id="{53280527-f75b-06ac-01d7-498318ada10c}" FolderPath="Resultants\">
-      <Declaration><![CDATA[//resets the content of this matrix to be the product of input matrix A x input matrix B
+      <Declaration><![CDATA[/// Resets the content of this matrix to be the product of input matrix A x input matrix B
 METHOD PUBLIC AsMatrixProduct : BOOL
 VAR_IN_OUT CONSTANT
 	A : Matrix;
@@ -179,7 +175,7 @@ AsMatrixProduct := Matrix_Product(A,B,THIS^);]]></ST>
       </Implementation>
     </Method>
     <Method Name="AsRowVector" Id="{46190744-41a6-0d8f-0bf6-d07b0ad4ecb0}" FolderPath="Resultants\">
-      <Declaration><![CDATA[//Resets the content of this matrix to be a row vector, copied from the specified row of the input matrix
+      <Declaration><![CDATA[/// Resets the content of this matrix to be a row vector, copied from the specified row of the input matrix
 METHOD PUBLIC AsRowVector : BOOL
 VAR_IN_OUT CONSTANT
 	M : Matrix;
@@ -199,7 +195,7 @@ END_VAR
       </Implementation>
     </Method>
     <Method Name="AsScaled" Id="{b4ebfd3a-7f84-0c68-3eb7-f5f1a49c6aeb}" FolderPath="Resultants\">
-      <Declaration><![CDATA[//resets the contents of this matrix to be an element by element product of the input matrix and the input scalar
+      <Declaration><![CDATA[/// Resets the contents of this matrix to be an element by element product of the input matrix and the input scalar
 METHOD PUBLIC AsScaled : BOOL
 VAR_IN_OUT CONSTANT
 	M : Matrix;
@@ -219,7 +215,7 @@ Scale(Scalar);]]></ST>
       </Implementation>
     </Method>
     <Method Name="AsShrunk" Id="{37c92294-b9bc-00a9-17a2-cb7d0631759a}" FolderPath="Resultants\">
-      <Declaration><![CDATA[//resets the contents of this matrix to be a copy of the input matrix with one fewer row and column (the specified row and column are removed)
+      <Declaration><![CDATA[/// Resets the contents of this matrix to be a copy of the input matrix with one fewer row and column (the specified row and column are removed)
 METHOD PUBLIC AsShrunk : BOOL
 VAR_IN_OUT CONSTANT
 	M : Matrix;
@@ -240,7 +236,7 @@ AsShrunk := Matrix_Shrink(M,THIS^,Row,Col);]]></ST>
       </Implementation>
     </Method>
     <Method Name="AsSubMatrix" Id="{f93c8810-7b34-0e2d-0d0e-56744d128372}" FolderPath="Resultants\">
-      <Declaration><![CDATA[//resets the contents of this matrix to be a copy of a continuous submatrix of the input reference matrix
+      <Declaration><![CDATA[/// Resets the contents of this matrix to be a copy of a continuous submatrix of the input reference matrix
 METHOD PUBLIC AsSubMatrix : BOOL
 VAR_IN_OUT CONSTANT
 	M : Matrix;
@@ -273,7 +269,7 @@ AsSubMatrix := Matrix_SubMatrix(M,THIS^,RowStart,RowCount,ColStart,ColCount);]]>
       </Implementation>
     </Method>
     <Method Name="AsTransposed" Id="{a2212529-f813-054e-209a-a7ba6ac5c31a}" FolderPath="Resultants\">
-      <Declaration><![CDATA[//Resets the contents of this matrix to be a transposed copy of the input matrix
+      <Declaration><![CDATA[/// Resets the contents of this matrix to be a transposed copy of the input matrix
 METHOD PUBLIC AsTransposed : BOOL
 VAR_IN_OUT CONSTANT
 	M : Matrix;
@@ -288,10 +284,8 @@ AsTransposed := Matrix_Transpose(M,THIS^);]]></ST>
       </Implementation>
     </Method>
     <Method Name="AsVectorCrossProduct" Id="{3ec0f3e8-0a31-090c-3d7c-88ea53422b02}" FolderPath="Resultants\">
-      <Declaration><![CDATA[//resets the contents of this matrix to be the result of a sequential vector cross product of all of the input matricies
+      <Declaration><![CDATA[/// Resets the contents of this matrix to be the result of a sequential vector cross product of all of the input matricies
 METHOD PUBLIC AsVectorCrossProduct : BOOL
-VAR_INPUT
-END_VAR
 VAR_IN_OUT CONSTANT
 	Vectors : ARRAY[*] OF POINTER TO Matrix;
 END_VAR
@@ -327,7 +321,7 @@ AsVectorCrossProduct := Vector_CrossProduct(Res := THIS^, Vectors := Vectors);]]
       </Implementation>
     </Method>
     <Property Name="Cols" Id="{09c98137-9055-00b0-0894-d32717273f77}" FolderPath="Overrides\">
-      <Declaration><![CDATA[//Total number of columns in this matrix
+      <Declaration><![CDATA[/// Total number of columns in this matrix
 PROPERTY PUBLIC Cols : UINT]]></Declaration>
       <Get Name="Get" Id="{ce7151de-32b2-073c-1f3b-8ce75ec362a9}">
         <Declaration><![CDATA[VAR
@@ -362,10 +356,7 @@ END_VAR
       </Implementation>
     </Method>
     <Method Name="Free" Id="{ed9227e7-8e2a-060e-3b7c-fa220c6f8eaf}" FolderPath="Initializers\">
-      <Declaration><![CDATA[METHOD PUBLIC Free
-VAR_INPUT
-END_VAR
-]]></Declaration>
+      <Declaration><![CDATA[METHOD PUBLIC Free]]></Declaration>
       <Implementation>
         <ST><![CDATA[Resize(0,0,FALSE,FALSE);
 Rows_ := 0;
@@ -376,14 +367,14 @@ END_IF;]]></ST>
       </Implementation>
     </Method>
     <Method Name="GetI" Id="{a2b5b528-33de-0111-2730-98e9e03688a1}" FolderPath="Overrides\">
-      <Declaration><![CDATA[//Gets the value of the element in this matrix at the supplied location as if the elements were stored in a 1D row-major array
-//:Prerequisites:
-// - I < Rows*Cols
-// - Matrix is not empty
-//If the supplied index is out of bounds the value 0 is returned and a warning is generated in the Error List
-METHOD PUBLIC GetI : LREAL//The value of the element at the specified index, or 0 if an invalid index is supplied
+      <Declaration><![CDATA[/// Gets the value of the element in this matrix at the supplied location as if the elements were stored in a 1D row-major array
+/// Prerequisites
+/// - I < Rows*Cols
+/// - Matrix is not empty
+/// If the supplied index is out of bounds the value 0 is returned and a warning is generated in the Error List
+METHOD PUBLIC GetI : LREAL //< The value of the element at the specified index, or 0 if an invalid index is supplied
 VAR_INPUT
-	I : UINT;//The index of the element which should have its value returned
+	I : UINT; //< The index of the element which should have its value returned
 END_VAR
 ]]></Declaration>
       <Implementation>
@@ -491,7 +482,7 @@ END_VAR
     <Method Name="InitMagicSquare" Id="{b6028141-d29b-0bb0-2bb8-954bb3757e26}" FolderPath="Initializers\">
       <Declaration><![CDATA[METHOD PUBLIC InitMagicSquare : BOOL
 VAR_INPUT
-	Size : UINT;//must be an odd number!
+	Size : UINT; //< must be an odd number!
 END_VAR
 VAR 
 	Result : BOOL;	
@@ -619,7 +610,7 @@ MemManager.Free2(Buffer);]]></ST>
 VAR_INPUT
 	NewRows : UINT;
 	NewCols : UINT;
-	RetainVals : BOOL;//retains 
+	RetainVals : BOOL; //< retains 
 	ClearVals : BOOL;
 END_VAR
 VAR
@@ -689,7 +680,7 @@ END_IF
       </Implementation>
     </Method>
     <Property Name="Rows" Id="{5a9e21cc-4483-01f1-1ffd-f7170d98d654}" FolderPath="Overrides\">
-      <Declaration><![CDATA[//Total number of rows in this matrix
+      <Declaration><![CDATA[/// Total number of rows in this matrix
 PROPERTY PUBLIC Rows : UINT]]></Declaration>
       <Get Name="Get" Id="{851dbb5a-4632-0955-0ca2-0204caf2236d}">
         <Declaration><![CDATA[VAR
@@ -701,12 +692,12 @@ END_VAR
       </Get>
     </Property>
     <Method Name="SetI" Id="{8240be42-2571-04a1-0d81-a5786edab7a1}" FolderPath="Overrides\">
-      <Declaration><![CDATA[//Sets the element specified by the supplied index to the suppleid value, assuming the data of the matrix is stored in a 1D row-major array
-//:Prerequisites: - I < Rows*Cols
-METHOD PUBLIC SetI : BOOL//TRUE if the specified index is valid and the data is copied. FLASE otherwise
+      <Declaration><![CDATA[/// Sets the element specified by the supplied index to the suppleid value, assuming the data of the matrix is stored in a 1D row-major array
+/// Prerequisites - I < Rows*Cols
+METHOD PUBLIC SetI : BOOL //< TRUE if the specified index is valid and the data is copied. FLASE otherwise
 VAR_INPUT
-	I : UINT;//The index specifying which element should be modified
-	Val : LREAL;//The value copied to the corresponding element
+	I : UINT; //< The index specifying which element should be modified
+	Val : LREAL; //< The value copied to the corresponding element
 END_VAR
 ]]></Declaration>
       <Implementation>
@@ -743,8 +734,6 @@ Shrink := AsShrunk(Temp,Row,Col);]]></ST>
     </Method>
     <Method Name="Transpose" Id="{5895d9f9-ae16-04ed-0e86-43484feeb00d}" FolderPath="Modifiers\">
       <Declaration><![CDATA[METHOD PUBLIC Transpose : BOOL
-VAR_INPUT
-END_VAR
 VAR
 	Temp : DynamicMatrix;
 END_VAR]]></Declaration>
diff --git a/TcMatrix/TcMatrix/POUs/ExternalStaticMatrix.TcPOU b/TcMatrix/TcMatrix/POUs/ExternalStaticMatrix.TcPOU
index 10ee3f2..7218494 100644
--- a/TcMatrix/TcMatrix/POUs/ExternalStaticMatrix.TcPOU
+++ b/TcMatrix/TcMatrix/POUs/ExternalStaticMatrix.TcPOU
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.9">
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4026.11">
   <POU Name="ExternalStaticMatrix" Id="{5b159a29-4d48-0710-367d-ddb55ec87279}" SpecialFunc="None">
     <Declaration><![CDATA[{attribute 'reflection'}
 {attribute 'no_assign'}
 FUNCTION_BLOCK ExternalStaticMatrix EXTENDS StaticMatrix
-VAR_INPUT
-END_VAR
-VAR_OUTPUT
-END_VAR
 VAR
 	Length_ : UINT;
 	Data : POINTER TO LREAL;
@@ -19,14 +15,16 @@ END_VAR
     <Folder Name="Initializers" Id="{5822050c-0c80-0707-31a1-3c552739c65e}" />
     <Folder Name="Overrides" Id="{fab6d9a1-db67-00dd-2f3e-ebf9953ff9e5}" />
     <Method Name="GetI" Id="{ae7d2383-cb95-0e9e-07e8-2a6bcfaf546b}" FolderPath="Overrides\">
-      <Declaration><![CDATA[//Gets the value of the element in this matrix at the supplied location as if the elements were stored in a 1D row-major array
-//:Prerequisites:
-// - I < Rows*Cols
-// - Matrix is not empty
-//If the supplied index is out of bounds the value 0 is returned and a warning is generated in the Error List
-METHOD PUBLIC GetI : LREAL//The value of the element at the specified index, or 0 if an invalid index is supplied
+      <Declaration><![CDATA[/// Gets the value of the element in this matrix at the supplied location as if the elements were stored in a 1D row-major array
+/// 
+/// Prerequisites
+/// - I < Rows*Cols
+/// - Matrix is not empty
+/// 
+/// If the supplied index is out of bounds the value 0 is returned and a warning is generated in the Error List
+METHOD PUBLIC GetI : LREAL //< The value of the element at the specified index, or 0 if an invalid index is supplied
 VAR_INPUT
-	I : UINT;//The index of the element which should have its value returned
+	I : UINT; //< The index of the element which should have its value returned
 END_VAR
 ]]></Declaration>
       <Implementation>
@@ -44,7 +42,7 @@ END_IF]]></ST>
     <Method Name="Init" Id="{d9100bed-2d4d-011e-0d0a-c69a8129f804}" FolderPath="Initializers\">
       <Declaration><![CDATA[METHOD PUBLIC Init
 VAR_INPUT
-	Buffer : POINTER TO LREAL;//must be at least length of Rows * cols!
+	Buffer : POINTER TO LREAL; //< must be at least length of Rows * cols!
 	RowCount : UINT;
 	ColCount : UINT;
 END_VAR
@@ -55,12 +53,12 @@ Data := BUFFER;]]></ST>
       </Implementation>
     </Method>
     <Method Name="SetI" Id="{8782231e-8005-09b5-02c8-d20a443b3036}" FolderPath="Overrides\">
-      <Declaration><![CDATA[//Sets the element specified by the supplied index to the suppleid value, assuming the data of the matrix is stored in a 1D row-major array
-//:Prerequisites: - I < Rows*Cols
-METHOD PUBLIC SetI : BOOL//TRUE if the specified index is valid and the data is copied. FLASE otherwise
+      <Declaration><![CDATA[/// Sets the element specified by the supplied index to the suppleid value, assuming the data of the matrix is stored in a 1D row-major array
+/// Prerequisites - I < Rows*Cols
+METHOD PUBLIC SetI : BOOL //< TRUE if the specified index is valid and the data is copied. FLASE otherwise
 VAR_INPUT
-	I : UINT;//The index specifying which element should be modified
-	Val : LREAL;//The value copied to the corresponding element
+	I : UINT; //< The index specifying which element should be modified
+	Val : LREAL; //< The value copied to the corresponding element
 END_VAR
 ]]></Declaration>
       <Implementation>
diff --git a/TcMatrix/TcMatrix/POUs/Functions/Arrays/Array2D_To_Matrix.TcPOU b/TcMatrix/TcMatrix/POUs/Functions/Arrays/Array2D_To_Matrix.TcPOU
index e411490..2fa68c2 100644
--- a/TcMatrix/TcMatrix/POUs/Functions/Arrays/Array2D_To_Matrix.TcPOU
+++ b/TcMatrix/TcMatrix/POUs/Functions/Arrays/Array2D_To_Matrix.TcPOU
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.9">
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4026.11">
   <POU Name="Array2D_To_Matrix" Id="{f3e50eaf-9dca-09c7-1725-57bc1aaea6bc}" SpecialFunc="None">
     <Declaration><![CDATA[FUNCTION Array2D_To_Matrix : BOOL
 VAR_IN_OUT CONSTANT
-	A : ARRAY[*,*] OF LREAL;//source matrix for element copy operation
+	A : ARRAY[*,*] OF LREAL; //< source matrix for element copy operation
 END_VAR
 VAR_IN_OUT
-	M : Matrix;//destination matrix for element copy operation
+	M : Matrix; //< destination matrix for element copy operation
 END_VAR
 VAR
 	Ri : UINT;
diff --git a/TcMatrix/TcMatrix/POUs/Functions/Arrays/Matrix_To_Array2D.TcPOU b/TcMatrix/TcMatrix/POUs/Functions/Arrays/Matrix_To_Array2D.TcPOU
index 1e1ba65..055fd32 100644
--- a/TcMatrix/TcMatrix/POUs/Functions/Arrays/Matrix_To_Array2D.TcPOU
+++ b/TcMatrix/TcMatrix/POUs/Functions/Arrays/Matrix_To_Array2D.TcPOU
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.9">
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4026.11">
   <POU Name="Matrix_To_Array2D" Id="{41ed1de7-51c4-0646-00f0-6ac02d756d55}" SpecialFunc="None">
     <Declaration><![CDATA[FUNCTION Matrix_To_Array2D : BOOL
 VAR_IN_OUT
-	A : ARRAY[*,*] OF LREAL;//destination matrix for element copy operation
+	A : ARRAY[*,*] OF LREAL; //< destination matrix for element copy operation
 END_VAR
 VAR_IN_OUT CONSTANT
-	M : Matrix;//source matrix for element copy operation
+	M : Matrix; //< source matrix for element copy operation
 END_VAR
 VAR
 	Ri : UINT;
diff --git a/TcMatrix/TcMatrix/POUs/Matrix.TcPOU b/TcMatrix/TcMatrix/POUs/Matrix.TcPOU
index 986920d..34815ae 100644
--- a/TcMatrix/TcMatrix/POUs/Matrix.TcPOU
+++ b/TcMatrix/TcMatrix/POUs/Matrix.TcPOU
@@ -1,33 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.9">
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4026.11">
   <POU Name="Matrix" Id="{37681762-a9e8-4dd1-b97b-ca342c51c659}" SpecialFunc="None">
-    <Declaration><![CDATA[(*
-Matrix Base Class
-=============
-
-Overview
--------------
-
-This abstract class encapsulates the logic of manipulating and interacting with matricies without forcing a specific memory management pattern.
-Derived classes are:
-
-- DynamicMatrix: A concrete class that dynamically allocates memory to take any form needed
-- StaticMatrix: An abstract class that serves as the base for classes with fixed memory sources
-- MatrixAccessor: An abstract class that serves as the base for classes that inherit the memory of another matrix and remap it to their own form
- 
-With either pattern the memory is accessed as a row-major 1D array of LREAL.
-
-*)
+    <Declaration><![CDATA[/// Matrix Base Class
+/// 
+/// This abstract class encapsulates the logic of manipulating and interacting with matricies without forcing a specific memory management pattern.
+/// Derived classes are:
+/// 
+/// - DynamicMatrix: A concrete class that dynamically allocates memory to take any form needed
+/// - StaticMatrix: An abstract class that serves as the base for classes with fixed memory sources
+/// - MatrixAccessor: An abstract class that serves as the base for classes that inherit the memory of another matrix and remap it to their own form
+///  
+/// With either pattern the memory is accessed as a row-major 1D array of LREAL.
 {attribute 'reflection'}
 {attribute 'no_assign'}
 FUNCTION_BLOCK ABSTRACT Matrix
-VAR_INPUT
-END_VAR
-VAR_OUTPUT
-END_VAR
 VAR
-
-	
 	{attribute 'instance-path'}
 	{attribute 'noinit'}
 	sPath_ : T_MaxString;
@@ -36,9 +23,8 @@ VAR
 	Ci : UINT;
 	I : UINT;
 	
-	ZeroReference_ : LREAL;//numbers below this are considered zero for the purposes of avoiding near-divide-by-zero floating point issues
-END_VAR
-]]></Declaration>
+	ZeroReference_ : LREAL; // Numbers below this are considered zero for the purposes of avoiding near-divide-by-zero floating point issues
+END_VAR]]></Declaration>
     <Implementation>
       <ST><![CDATA[LogMessage('%s: There is no need to call the main FB function for type Matrix');]]></ST>
     </Implementation>
@@ -51,7 +37,7 @@ END_VAR
     <Folder Name="Properties" Id="{63bcd68f-51b7-4cdd-bc76-abfb7c04d216}" />
     <Folder Name="Protected" Id="{52ab6c01-12bf-4ee4-b7d8-7459de792de0}" />
     <Property Name="Average" Id="{bbb5565e-c8b8-06a4-072f-2f69a4299899}" FolderPath="Aggregators\">
-      <Declaration><![CDATA[//returns the average value of all elements
+      <Declaration><![CDATA[/// Returns the average value of all elements
 PROPERTY PUBLIC Average : LREAL]]></Declaration>
       <Get Name="Get" Id="{3df0d655-ce9c-0473-3f0c-ac0787664407}">
         <Declaration><![CDATA[VAR
@@ -67,7 +53,7 @@ END_IF]]></ST>
       </Get>
     </Property>
     <Property Name="BufferSize" Id="{f271d29f-8d22-4870-9606-910840251c4c}" FolderPath="Properties\">
-      <Declaration><![CDATA[//The length (in Bytes) of the memory allocated to storing element data for this matrix
+      <Declaration><![CDATA[/// The length (in Bytes) of the memory allocated to storing element data for this matrix
 PROPERTY PUBLIC BufferSize : UDINT]]></Declaration>
       <Get Name="Get" Id="{cde88b07-59bd-48ab-b6be-612e25f0f9b5}">
         <Declaration><![CDATA[VAR
@@ -79,17 +65,14 @@ END_VAR
       </Get>
     </Property>
     <Method Name="Clear" Id="{788b000b-9652-4513-87ea-afa0efbc93b4}" FolderPath="Modifiers\">
-      <Declaration><![CDATA[//Resets the value of every element in this matrix to zero
-METHOD PUBLIC Clear
-VAR_INPUT
-END_VAR
-]]></Declaration>
+      <Declaration><![CDATA[/// Resets the value of every element in this matrix to zero
+METHOD PUBLIC Clear]]></Declaration>
       <Implementation>
         <ST><![CDATA[FillTrapezoidal(0,0,0);]]></ST>
       </Implementation>
     </Method>
     <Property Name="Cols" Id="{d523fd23-40b0-0c12-048f-35d989fa4f45}" FolderPath="Properties\">
-      <Declaration><![CDATA[//Total number of columns in this matrix
+      <Declaration><![CDATA[/// Total number of columns in this matrix
 PROPERTY PUBLIC ABSTRACT Cols : UINT]]></Declaration>
       <Get Name="Get" Id="{a7a6e0d6-1627-0349-3c56-d4f322f68321}">
         <Declaration><![CDATA[VAR
@@ -101,16 +84,14 @@ END_VAR
       </Get>
     </Property>
     <Method Name="CopyFrom" Id="{dae02926-a792-0e0c-1dd5-5763605fc7fb}" FolderPath="Modifiers\">
-      <Declaration><![CDATA[(*Copy the value from each element in the source matrix to each corresponding element in this matrix
-
-:Prerequisites:
- - This matrix is the same size as the source matrix
- - Neither matrix is empty
- 
- *)
-METHOD PUBLIC CopyFrom : BOOL//Returns true if the prerequisites were met and the data was copied, false otherwise
+      <Declaration><![CDATA[/// Copy the value from each element in the source matrix to each corresponding element in this matrix
+///
+/// Prerequisites
+/// - This matrix is the same size as the source matrix
+/// - Neither matrix is empty
+METHOD PUBLIC CopyFrom : BOOL //< Returns true if the prerequisites were met and the data was copied, false otherwise
 VAR_IN_OUT CONSTANT
-	M : Matrix;//Source of the copy operation
+	M : Matrix; //< Source of the copy operation
 END_VAR
 ]]></Declaration>
       <Implementation>
@@ -118,16 +99,14 @@ END_VAR
       </Implementation>
     </Method>
     <Method Name="CopyTo" Id="{8ef25dfb-afc0-053f-1591-86389e6847af}" FolderPath="Helpers\">
-      <Declaration><![CDATA[(*Copy the value from each element in this matrix to each corresponding element in the destination matrix
-
-:Prerequisites:
- - This matrix is the same size as the destination matrix
- - Neither matrix is empty
- 
- *)
-METHOD PUBLIC CopyTo : BOOL//Returns true if the prerequisites were met and the data was copied, false otherwise
+      <Declaration><![CDATA[/// Copy the value from each element in this matrix to each corresponding element in the destination matrix
+/// 
+/// Prerequisites
+/// - This matrix is the same size as the destination matrix
+/// - Neither matrix is empty
+METHOD PUBLIC CopyTo : BOOL //< Returns true if the prerequisites were met and the data was copied, false otherwise
 VAR_IN_OUT
-	M : Matrix;//Destination for the copy operation
+	M : Matrix; //< Destination for the copy operation
 END_VAR
 ]]></Declaration>
       <Implementation>
@@ -135,19 +114,18 @@ END_VAR
       </Implementation>
     </Method>
     <Method Name="ElementDifference" Id="{e1125626-a54e-0cea-3fa3-0f21fba9398c}" FolderPath="Modifiers\">
-      <Declaration><![CDATA[(*
-For each element in this matrix, calculate a new value by Subtracting the value of the corresponding element of the supplied matrix from the value in this matrix
-
-THIS := THIS - M
-
-:Prerequisites:
- - This matrix is the same size as the supplied matrix
- - Neither matrix is empty
- 
- *)
-METHOD PUBLIC ElementDifference : BOOL//TRUE if the operation completes successfully, false if the prerequisites are not met
+      <Declaration><![CDATA[/// For each element in this matrix, calculate a new value by Subtracting the value of the corresponding element of the supplied matrix from the value in this matrix
+/// 
+/// ```st
+/// THIS := THIS - M
+/// ``` 
+///
+/// Prerequisites
+/// - This matrix is the same size as the supplied matrix
+/// - Neither matrix is empty
+METHOD PUBLIC ElementDifference : BOOL //< TRUE if the operation completes successfully, false if the prerequisites are not met
 VAR_IN_OUT CONSTANT
-	M : Matrix;//the subtrahend in the subtraction
+	M : Matrix; //< the subtrahend in the subtraction
 END_VAR
 ]]></Declaration>
       <Implementation>
@@ -155,19 +133,18 @@ END_VAR
       </Implementation>
     </Method>
     <Method Name="ElementProduct" Id="{0f328a92-3951-078e-3107-736a766f63a8}" FolderPath="Modifiers\">
-      <Declaration><![CDATA[(*
-For each element in this matrix, calculate a new value by Multiplying the value of the corresponding element of the supplied matrix with the value in this matrix
-
-THIS := THIS .* M
-
-:Prerequisites:
- - This matrix is the same size as the supplied matrix
- - Neither matrix is empty
- 
- *)
-METHOD PUBLIC ElementProduct : BOOL//TRUE if the operation completes successfully, false if the prerequisites are not met
+      <Declaration><![CDATA[/// For each element in this matrix, calculate a new value by Multiplying the value of the corresponding element of the supplied matrix with the value in this matrix
+/// 
+/// ```st
+/// THIS := THIS .* M
+/// ```
+///
+/// Prerequisites
+/// - This matrix is the same size as the supplied matrix
+/// - Neither matrix is empty
+METHOD PUBLIC ElementProduct : BOOL //< TRUE if the operation completes successfully, false if the prerequisites are not met
 VAR_IN_OUT CONSTANT
-	M : Matrix;//the supplied matrix to be multiplied element-by-element to this matrix
+	M : Matrix; //< the supplied matrix to be multiplied element-by-element to this matrix
 END_VAR
 ]]></Declaration>
       <Implementation>
@@ -175,19 +152,18 @@ END_VAR
       </Implementation>
     </Method>
     <Method Name="ElementSum" Id="{009657bb-27d7-0cc7-0f12-e292b249bb77}" FolderPath="Modifiers\">
-      <Declaration><![CDATA[(*
-For each element in this matrix, calculate a new value by Adding the value of the corresponding element of the supplied matrix with the value in this matrix
-
-THIS := THIS + M
-
-:Prerequisites:
- - This matrix is the same size as the supplied matrix
- - Neither matrix is empty
- 
- *)
-METHOD PUBLIC ElementSum : BOOL//TRUE if the operation completes successfully, false if the prerequisites are not met
+      <Declaration><![CDATA[/// For each element in this matrix, calculate a new value by Adding the value of the corresponding element of the supplied matrix with the value in this matrix
+///
+/// ```st 
+/// THIS := THIS + M
+/// ```
+///
+/// Prerequisites
+/// - This matrix is the same size as the supplied matrix
+/// - Neither matrix is empty
+METHOD PUBLIC ElementSum : BOOL //< TRUE if the operation completes successfully, false if the prerequisites are not met
 VAR_IN_OUT CONSTANT
-	M : Matrix;//the supplied matrix to be added to this matrix
+	M : Matrix; //< the supplied matrix to be added to this matrix
 END_VAR
 ]]></Declaration>
       <Implementation>
@@ -195,12 +171,10 @@ END_VAR
       </Implementation>
     </Method>
     <Method Name="FillFrom" Id="{022b237b-0584-4ce7-a547-77e65ab3d048}" FolderPath="Modifiers\">
-      <Declaration><![CDATA[(*
-For every element that exist in both this matrix and the source matrix, copy the value from the source matrix into this matrix
-*)
+      <Declaration><![CDATA[/// For every element that exist in both this matrix and the source matrix, copy the value from the source matrix into this matrix
 METHOD PUBLIC FillFrom
 VAR_IN_OUT CONSTANT
-	M : Matrix;//source matrix for element copy operation
+	M : Matrix; //< Source matrix for element copy operation
 END_VAR]]></Declaration>
       <Implementation>
         <ST><![CDATA[IF M.IsEmpty OR IsEmpty THEN
@@ -215,12 +189,10 @@ END_FOR]]></ST>
       </Implementation>
     </Method>
     <Method Name="FillFromArray2D" Id="{2cb8ce14-15ec-0e5f-0bdb-629074473dbd}" FolderPath="Modifiers\">
-      <Declaration><![CDATA[(*
-For every element that exist in both this matrix and the source array, copy the value from the source array into this matrix
-*)
+      <Declaration><![CDATA[/// For every element that exist in both this matrix and the source array, copy the value from the source array into this matrix
 METHOD PUBLIC FillFromArray2D
 VAR_IN_OUT CONSTANT
-	A : ARRAY[*,*] OF LREAL;//source matrix for element copy operation
+	A : ARRAY[*,*] OF LREAL; //< source matrix for element copy operation
 END_VAR
 VAR
 	inRows : UINT;
@@ -242,17 +214,16 @@ END_FOR]]></ST>
       </Implementation>
     </Method>
     <Method Name="FillFromAt" Id="{57397ef9-06ec-050d-1f21-ec905dd7b0ad}" FolderPath="Modifiers\">
-      <Declaration><![CDATA[//Consider the subset of elements in this matrix starting and the supplied initial row and column as a submatrix. 
-//For every element that exists in both the submatrix and the supplies source matrix, copy the value from the source matrix into the corresponding element of the submatrix.
+      <Declaration><![CDATA[/// Consider the subset of elements in this matrix starting and the supplied initial row and column as a submatrix. 
+/// For every element that exists in both the submatrix and the supplies source matrix, copy the value from the source matrix into the corresponding element of the submatrix.
 METHOD PUBLIC FillFromAt
 VAR_IN_OUT CONSTANT
-	M : Matrix;//Source matrix for the copy operation
+	M : Matrix; //< Source matrix for the copy operation
 END_VAR
 VAR_INPUT
-	RStart : UINT;//Row within this matrix to start the fill operation
-	CStart : UINT;//Column within this matrix to start the fill operation
+	RStart : UINT; //< Row within this matrix to start the fill operation
+	CStart : UINT; //< Column within this matrix to start the fill operation
 END_VAR
-
 VAR
 	SubMatrix : SubMatrixAccessor;
 END_VAR]]></Declaration>
@@ -282,12 +253,12 @@ SubMatrix.FillFrom(M);]]></ST>
       </Implementation>
     </Method>
     <Method Name="FillTrapezoidal" Id="{f5fa3a45-37d2-08ef-0015-41ed1be8ef4b}" FolderPath="Modifiers\">
-      <Declaration><![CDATA[//Fills all elements of this matrix based on which of three zones it is located into when considered as a trapezoidal matrix
+      <Declaration><![CDATA[/// Fills all elements of this matrix based on which of three zones it is located into when considered as a trapezoidal matrix
 METHOD PUBLIC FillTrapezoidal
 VAR_INPUT
-	Diagonal : LREAL;//Every element on the main diagonal of the matrix is set to this value.
-	UpperRight : LREAL;//Every element above or to the right of the main diagonal is set to this value;
-	LowerLeft : LREAL;//Every element below or to the left of the main diagonal is set to this value;
+	Diagonal : LREAL; //< Every element on the main diagonal of the matrix is set to this value.
+	UpperRight : LREAL; //< Every element above or to the right of the main diagonal is set to this value;
+	LowerLeft : LREAL; //< Every element below or to the left of the main diagonal is set to this value;
 END_VAR
 ]]></Declaration>
       <Implementation>
@@ -311,14 +282,15 @@ END_FOR]]></ST>
       </Implementation>
     </Method>
     <Method Name="GetDeterminant" Id="{4690878e-585c-49dd-a170-b0f3c7ff17f5}" FolderPath="Getters\">
-      <Declaration><![CDATA[//Gets the determinant of this matrix
-//
-//:Prerequisites:
-// - Matrix is not empty
-// - Matrix is square
-//
-//.. note:: If this matrix does not meet the requirements 0 is returned
-METHOD PUBLIC GetDeterminant : LREAL//The determinant of this matrix, if the prerequisites are met. Otherwise, returns 0.
+      <Declaration><![CDATA[/// Gets the determinant of this matrix
+/// 
+/// Prerequisites
+/// - Matrix is not empty
+/// - Matrix is square
+/// 
+/// > [!NOTE]
+/// > If this matrix does not meet the requirements 0 is returned
+METHOD PUBLIC GetDeterminant : LREAL //< The determinant of this matrix, if the prerequisites are met. Otherwise, returns 0.
 VAR_INPUT
 END_VAR
 VAR
@@ -335,16 +307,17 @@ END_IF
       </Implementation>
     </Method>
     <Method Name="GetI" Id="{15777527-77a2-42cc-8d9c-f624271cdfcd}" FolderPath="Getters\">
-      <Declaration><![CDATA[//Gets the value of the element in this matrix at the supplied location as if the elements were stored in a 1D row-major array
-//
-//:Prerequisites:
-// - I < Rows*Cols
-// - Matrix is not empty
-//
-//.. note:: If the supplied index is out of bounds the value 0 is returned and a warning is generated in the Error List
-METHOD PUBLIC ABSTRACT GetI : LREAL//The value of the element at the specified index, or 0 if an invalid index is supplied
+      <Declaration><![CDATA[/// Gets the value of the element in this matrix at the supplied location as if the elements were stored in a 1D row-major array
+/// 
+/// Prerequisites
+/// - I < Rows*Cols
+/// - Matrix is not empty
+/// 
+/// > [!NOTE]
+/// > If the supplied index is out of bounds the value 0 is returned and a warning is generated in the Error List
+METHOD PUBLIC ABSTRACT GetI : LREAL //< The value of the element at the specified index, or 0 if an invalid index is supplied
 VAR_INPUT
-	I : UINT;//The index of the element which should have its value returned
+	I : UINT; //< The index of the element which should have its value returned
 END_VAR
 ]]></Declaration>
       <Implementation>
@@ -352,18 +325,19 @@ END_VAR
       </Implementation>
     </Method>
     <Method Name="GetRC" Id="{fa44f9d9-95b5-4fc6-badf-738b5a3911f1}" FolderPath="Getters\">
-      <Declaration><![CDATA[//returns the value of the element of this matrix at the specified row and column.
-//
-//:Prerequisites:
-// - Row < Rows
-// - Col < Cols
-// - Matrix is not empty
-//
-//.. note:: If the supplied or or column is out of bounds then a warning message is generated in the Error List and the value 0 is returned
-METHOD PUBLIC GetRC : LREAL//The value of the element at the specified row and column, or 0 if an invalid index is supplied
+      <Declaration><![CDATA[/// Returns the value of the element of this matrix at the specified row and column.
+/// 
+/// Prerequisites
+/// - Row < Rows
+/// - Col < Cols
+/// - Matrix is not empty
+/// 
+/// > [!NOTE]
+/// > If the supplied or or column is out of bounds then a warning message is generated in the Error List and the value 0 is returned
+METHOD PUBLIC GetRC : LREAL //< The value of the element at the specified row and column, or 0 if an invalid index is supplied
 VAR_INPUT
-	Row : UINT;//The row of the element to fetch
-	Col : UINT;//The column of the element to fetch
+	Row : UINT; //< The row of the element to fetch
+	Col : UINT; //< The column of the element to fetch
 END_VAR
 ]]></Declaration>
       <Implementation>
@@ -395,15 +369,16 @@ END_VAR
       </Implementation>
     </Method>
     <Method Name="GetSize" Id="{61a33f57-364a-4e27-9ba3-9caf9ad98b8f}" FolderPath="Getters\">
-      <Declaration><![CDATA[//Returns the length of the matrix in the specified dimension
-//
-// - GetSize(0) is equivalent to Rows
-// - GetSize(1) is equivalent to Cols
-//
-//.. note:: If an invalid dimension is supplied then a warning is generated in the Error List and the value 0 is returned
-METHOD PUBLIC GetSize : UINT//The length of the matrix in the specified dimension, or 0 if the dimension specified is invalid
+      <Declaration><![CDATA[/// Returns the length of the matrix in the specified dimension
+/// 
+/// - GetSize(0) is equivalent to Rows
+/// - GetSize(1) is equivalent to Cols
+/// 
+/// > [!NOTE] 
+/// > If an invalid dimension is supplied then a warning is generated in the Error List and the value 0 is returned
+METHOD PUBLIC GetSize : UINT //< The length of the matrix in the specified dimension, or 0 if the dimension specified is invalid
 VAR_INPUT
-	Dim : UINT;//The dimension of the matrix for which the size should be returned. 0=Rows, 1=Cols
+	Dim : UINT; //< The dimension of the matrix for which the size should be returned. 0=Rows, 1=Cols
 END_VAR
 ]]></Declaration>
       <Implementation>
@@ -418,10 +393,8 @@ END_IF]]></ST>
       </Implementation>
     </Method>
     <Method Name="GetStringLengthEstimate" Id="{105d6985-ce7b-0363-01e4-eb441c24368f}" FolderPath="Helpers\">
-      <Declaration><![CDATA[//Calulates how long of a string (in Bytes) is required in order to print the entire contents of the matrix using the WriteDataToString function
+      <Declaration><![CDATA[/// Calulates how long of a string (in Bytes) is required in order to print the entire contents of the matrix using the WriteDataToString function
 METHOD PUBLIC GetStringLengthEstimate : UDINT;
-VAR_INPUT
-END_VAR
 VAR
 	CharsPerElement : UDINT := 20;//15 point precision, decimal, sign, leading zero, comma, space
 	CharsPerRow : UDINT := 6;//space, semicolon, carriage return, line return, space, space
@@ -445,23 +418,21 @@ END_VAR
       </Implementation>
     </Method>
     <Method Name="GetTransposeMatrixAccessor" Id="{5dc6f40a-ecba-0ce5-0744-b541aad5ef72}" FolderPath="Accessors\">
-      <Declaration><![CDATA[METHOD PUBLIC GetTransposeMatrixAccessor : TransposeMatrixAccessor
-VAR_INPUT
-END_VAR
-]]></Declaration>
+      <Declaration><![CDATA[METHOD PUBLIC GetTransposeMatrixAccessor : TransposeMatrixAccessor]]></Declaration>
       <Implementation>
         <ST><![CDATA[GetTransposeMatrixAccessor.Init(THIS^);]]></ST>
       </Implementation>
     </Method>
     <Method Name="GetVectorDotProduct" Id="{1658fad0-9792-0d13-3da1-4022c6478285}" FolderPath="Getters\">
-      <Declaration><![CDATA[//Returns the vector dot product of this matrix and the supplied other matrix (ignoring the orientation of both matricies).
-//:Prerequisites:
-// - This matrix is a vector and is not empty
-// - The supplied other matrix is a vector and is not empty
-// - This vector has the same length (but not necessarily orientation) as the supplied vector
-METHOD PUBLIC GetVectorDotProduct : LREAL//The dot product (element-wise product) of this vector and the supplied vector, or 0 if the inputs are invalid
+      <Declaration><![CDATA[/// Returns the vector dot product of this matrix and the supplied other matrix (ignoring the orientation of both matricies).
+///
+/// Prerequisites
+///  - This matrix is a vector and is not empty
+///  - The supplied other matrix is a vector and is not empty
+///  - This vector has the same length (but not necessarily orientation) as the supplied vector
+METHOD PUBLIC GetVectorDotProduct : LREAL //< The dot product (element-wise product) of this vector and the supplied vector, or 0 if the inputs are invalid
 VAR_IN_OUT CONSTANT
-	V : Matrix;//The vector which which the dot product of this vector should be taken.
+	V : Matrix; //< The vector which which the dot product of this vector should be taken.
 END_VAR
 VAR
 	Res : LREAL;
@@ -476,15 +447,14 @@ END_IF]]></ST>
       </Implementation>
     </Method>
     <Method Name="GetVectorMagnitude" Id="{2cda7f0d-36ea-0716-0a39-1b669b254390}" FolderPath="Getters\">
-      <Declaration><![CDATA[//Calcualtes the vector magnitude of this matrix (square root of the sum of the squares), assuming it is a vector.
-//
-//:Prerequisites:
-// - This matrix is not empty and is a vector
-//
-//.. note:: If this matrix is empty or is not a vector, 0 is returned
+      <Declaration><![CDATA[/// Calcualtes the vector magnitude of this matrix (square root of the sum of the squares), assuming it is a vector.
+/// 
+/// Prerequisites
+/// - This matrix is not empty and is a vector
+/// 
+/// > [!NOTE] 
+/// > If this matrix is empty or is not a vector, 0 is returned
 METHOD PUBLIC GetVectorMagnitude : LREAL//The vector magnitude of this matrix if it is a vector, otherwise 0
-VAR_INPUT
-END_VAR
 VAR
 	Res : LREAL;
 END_VAR]]></Declaration>
@@ -514,10 +484,10 @@ Row := (Index - Col) / ColCount;]]></ST>
       </Implementation>
     </Method>
     <Method Name="IntPower" Id="{6bdcc943-6222-00fa-3a06-a537022f40c0}" FolderPath="Modifiers\">
-      <Declaration><![CDATA[//Raises every element of the matrix to the supplied power
+      <Declaration><![CDATA[/// Raises every element of the matrix to the supplied power
 METHOD PUBLIC IntPower
 VAR_INPUT
-	Exponent : INT;//Power with which to raise every element of the matrix
+	Exponent : INT; //< Power with which to raise every element of the matrix
 END_VAR
 ]]></Declaration>
       <Implementation>
@@ -530,14 +500,14 @@ END_FOR]]></ST>
       </Implementation>
     </Method>
     <Method Name="InvertSquare" Id="{a64d1a3c-dedb-0302-0073-1fce8da4a4ec}" FolderPath="Modifiers\">
-      <Declaration><![CDATA[//Inverts the matrix. May fail if the matrix is too close to being singular. Use the tolerance input to specify how close to go (1E-6 to 1E-9 is porbably good).
-//
-//:Prerequisites:
-//- This matrix is square
-//- This matrix is not empty
-METHOD PUBLIC InvertSquare : BOOL//True if the inverse has been calculated. False if a precondition was not met, or a near-singularity was detected (data may be malformed).
+      <Declaration><![CDATA[/// Inverts the matrix. May fail if the matrix is too close to being singular. Use the tolerance input to specify how close to go (1E-6 to 1E-9 is porbably good).
+///
+/// Prerequisites
+/// - This matrix is square
+/// - This matrix is not empty
+METHOD PUBLIC InvertSquare : BOOL //< True if the inverse has been calculated. False if a precondition was not met, or a near-singularity was detected (data may be malformed).
 VAR_INPUT
-	Tolerance : LREAL;//The smallest magnitude of number that is allowed to be used as a denominator in the calculation of the inverse
+	Tolerance : LREAL; //< The smallest magnitude of number that is allowed to be used as a denominator in the calculation of the inverse
 END_VAR
 ]]></Declaration>
       <Implementation>
@@ -545,7 +515,7 @@ END_VAR
       </Implementation>
     </Method>
     <Property Name="IsCleared" Id="{066f6b71-08d6-0966-16ee-3e8688b515c8}" FolderPath="Helpers\">
-      <Declaration><![CDATA[//Returns TRUE if every element of the matrix is equal to zero, or the matrix is empty
+      <Declaration><![CDATA[/// Returns TRUE if every element of the matrix is equal to zero, or the matrix is empty
 PROPERTY PUBLIC IsCleared : BOOL]]></Declaration>
       <Get Name="Get" Id="{ff11b87f-acf8-086b-3eb7-73b184f48aea}">
         <Declaration><![CDATA[VAR
@@ -571,7 +541,7 @@ IsCleared := TRUE;]]></ST>
       </Get>
     </Property>
     <Property Name="IsEmpty" Id="{c235a1c3-19da-47f7-9309-34932eb65324}" FolderPath="Helpers\">
-      <Declaration><![CDATA[//Returns true if the matrix does not have any addresible elements
+      <Declaration><![CDATA[/// Returns true if the matrix does not have any addresible elements
 PROPERTY PUBLIC IsEmpty : Bool]]></Declaration>
       <Get Name="Get" Id="{ae4f7dd7-6afa-42b8-914f-506a87feabaa}">
         <Declaration><![CDATA[VAR
@@ -583,14 +553,15 @@ END_VAR
       </Get>
     </Property>
     <Method Name="IsEqual" Id="{864b7d2e-c191-4c91-985a-939f8832c318}" FolderPath="Comparators\">
-      <Declaration><![CDATA[//Determines if this matrix is equal to a supplied matrix.
-//
-//Two matricies are considered equal if they are the same size and every set of corresponding elements are equal.
-//
-//.. note:: Two empty matricies are considered equal.
-METHOD PUBLIC IsEqual : BOOL//TRUE if the two matricies are equal, FALSE if they are not
+      <Declaration><![CDATA[/// Determines if this matrix is equal to a supplied matrix.
+/// 
+/// Two matricies are considered equal if they are the same size and every set of corresponding elements are equal.
+/// 
+/// > [!NOTE] 
+/// > Two empty matricies are considered equal.
+METHOD PUBLIC IsEqual : BOOL //< TRUE if the two matricies are equal, FALSE if they are not
 VAR_IN_OUT CONSTANT
-	M : Matrix;//The other matrix to compare to this one
+	M : Matrix; //< The other matrix to compare to this one
 END_VAR
 ]]></Declaration>
       <Implementation>
@@ -620,12 +591,13 @@ IsEqual := TRUE;]]></ST>
       </Implementation>
     </Method>
     <Method Name="IsEqualSize" Id="{27be0354-ccaa-4d4d-aa11-92c8ff0d05d2}" FolderPath="Comparators\">
-      <Declaration><![CDATA[//Checks if this matrix is the same size (number of rows and number of columns match) as the supplied matrix.
-//
-//.. note:: two empty matricies are considered the same size.
-METHOD PUBLIC IsEqualSize : BOOL//True if this matrix is the same size as the supplied matrix
+      <Declaration><![CDATA[/// Checks if this matrix is the same size (number of rows and number of columns match) as the supplied matrix.
+///
+/// > [!NOTE]
+/// > Two empty matricies are considered the same size.
+METHOD PUBLIC IsEqualSize : BOOL //< True if this matrix is the same size as the supplied matrix
 VAR_IN_OUT CONSTANT
-	M : Matrix;//The matrix which should have its size compared to the size of this matrix
+	M : Matrix; //< The matrix which should have its size compared to the size of this matrix
 END_VAR
 ]]></Declaration>
       <Implementation>
@@ -633,16 +605,17 @@ END_VAR
       </Implementation>
     </Method>
     <Method Name="IsNearlyEqual" Id="{5d748479-c05b-0288-3d27-e100bad6055b}" FolderPath="Comparators\">
-      <Declaration><![CDATA[//Determines if this matrix is *nearly* equal to a supplied matrix, based on a supplied precision.
-//
-//Two matricies are considered nearly equal if they are the same size and every set of corresponding elements are equal to within the supplied precision.
-//.. note:: Note that two empty matricies are considered equal
-METHOD PUBLIC IsNearlyEqual : BOOL//TRUE if the two matricies are nearly equal, FALSE if they are not
+      <Declaration><![CDATA[/// Determines if this matrix is *nearly* equal to a supplied matrix, based on a supplied precision.
+/// 
+/// Two matricies are considered nearly equal if they are the same size and every set of corresponding elements are equal to within the supplied precision.
+/// > [!NOTE]
+/// > Note that two empty matricies are considered equal
+METHOD PUBLIC IsNearlyEqual : BOOL //< TRUE if the two matricies are nearly equal, FALSE if they are not
 VAR_IN_OUT CONSTANT
-	M : Matrix;//The other matrix to compare to this one
+	M : Matrix; //< The other matrix to compare to this one
 END_VAR
 VAR_INPUT
-	Precision : LREAL;//Deviation between two elements larger than this value makes them unequal
+	Precision : LREAL; //< Deviation between two elements larger than this value makes them unequal
 END_VAR
 
 ]]></Declaration>
@@ -673,10 +646,10 @@ IsNearlyEqual := TRUE;]]></ST>
       </Implementation>
     </Method>
     <Method Name="IsNearZero" Id="{14d96c82-fff9-0250-2cd6-b017194a9777}" FolderPath="Helpers\">
-      <Declaration><![CDATA[//Returns true if the supplied value is near enough to zero that it should not be used as a divisor. See the property ZeroReference
+      <Declaration><![CDATA[/// Returns true if the supplied value is near enough to zero that it should not be used as a divisor. See the property ZeroReference
 METHOD PROTECTED IsNearZero : BOOL
 VAR_INPUT
-	IN : LREAL;//The value which should have its magnitude evaluated
+	IN : LREAL; //< The value which should have its magnitude evaluated
 END_VAR
 ]]></Declaration>
       <Implementation>
@@ -684,7 +657,7 @@ END_VAR
       </Implementation>
     </Method>
     <Property Name="IsSquare" Id="{e672b3bd-9ada-4884-9298-de073113df9b}" FolderPath="Helpers\">
-      <Declaration><![CDATA[//Returns true if this matrix is not empty, and the number of columns is equal to the number of rows
+      <Declaration><![CDATA[/// Returns true if this matrix is not empty, and the number of columns is equal to the number of rows
 PROPERTY PUBLIC IsSquare : BOOL]]></Declaration>
       <Get Name="Get" Id="{4255b8b2-db7d-4f6c-90fc-32930d8d75f2}">
         <Declaration><![CDATA[VAR
@@ -696,7 +669,7 @@ END_VAR
       </Get>
     </Property>
     <Property Name="IsVector" Id="{fa53e68e-f9cd-4264-b4bc-c5aa3563b636}" FolderPath="Helpers\">
-      <Declaration><![CDATA[//Returns true if this matrix is not empty, and at least one dimension has a size of 1 (row vector or column vector).
+      <Declaration><![CDATA[/// Returns true if this matrix is not empty, and at least one dimension has a size of 1 (row vector or column vector).
 PROPERTY PUBLIC IsVector : BOOL]]></Declaration>
       <Get Name="Get" Id="{37d299d5-2a39-4c73-888a-5f06acc43d3e}">
         <Declaration><![CDATA[VAR
@@ -708,7 +681,7 @@ END_VAR
       </Get>
     </Property>
     <Property Name="Length" Id="{2c497c08-f008-0342-1d0c-6819a4969e69}" FolderPath="Properties\">
-      <Declaration><![CDATA[//Total number of elements in this matrix
+      <Declaration><![CDATA[/// Total number of elements in this matrix
 PROPERTY PUBLIC Length : UINT]]></Declaration>
       <Get Name="Get" Id="{fc001511-17d0-03a1-3ade-ffcc96d39c1c}">
         <Declaration><![CDATA[VAR
@@ -720,10 +693,10 @@ END_VAR
       </Get>
     </Property>
     <Method Name="LogError" Id="{0d93f53f-aa75-038c-24c9-4008df3d6da2}" FolderPath="Helpers\">
-      <Declaration><![CDATA[//Logs the supplied message to the error output as an 'Error'
+      <Declaration><![CDATA[/// Logs the supplied message to the error output as an 'Error'
 METHOD PROTECTED LogError
 VAR_INPUT
-	Message : T_MaxString;//The message to log. %s is substituted with the symbolic address of this matrix.
+	Message : T_MaxString; //< The message to log. %s is substituted with the symbolic address of this matrix.
 END_VAR
 ]]></Declaration>
       <Implementation>
@@ -731,10 +704,10 @@ END_VAR
       </Implementation>
     </Method>
     <Method Name="LogEvent" Id="{8171c1d6-5906-0bfd-0ba5-b722be9c1e72}" FolderPath="Helpers\">
-      <Declaration><![CDATA[//Logs the supplied message to the windoes event log
+      <Declaration><![CDATA[/// Logs the supplied message to the windoes event log
 METHOD PROTECTED LogEvent
 VAR_INPUT
-	Message : T_MaxString;//The message to log. %s is substituted with the symbolic address of this matrix.
+	Message : Tc2_System.T_MaxString; //< The message to log. %s is substituted with the symbolic address of this matrix.
 END_VAR
 ]]></Declaration>
       <Implementation>
@@ -742,10 +715,10 @@ END_VAR
       </Implementation>
     </Method>
     <Method Name="LogMessage" Id="{97d8748b-f9e0-0605-025f-e9b0af536375}" FolderPath="Helpers\">
-      <Declaration><![CDATA[//Logs the supplied message to the error output as a 'Message'
+      <Declaration><![CDATA[/// Logs the supplied message to the error output as a 'Message'
 METHOD PROTECTED LogMessage
 VAR_INPUT
-	Message : T_MaxString;//The message to log. %s is substituted with the symbolic address of this matrix.
+	Message : Tc2_System.T_MaxString; //< The message to log. %s is substituted with the symbolic address of this matrix.
 END_VAR
 ]]></Declaration>
       <Implementation>
@@ -753,10 +726,10 @@ END_VAR
       </Implementation>
     </Method>
     <Method Name="LogWarning" Id="{9209617a-719a-05c3-2a97-800df97be0bd}" FolderPath="Helpers\">
-      <Declaration><![CDATA[//Logs the supplied message to the error output as a 'Warning'
+      <Declaration><![CDATA[/// Logs the supplied message to the error output as a 'Warning'
 METHOD PROTECTED LogWarning
 VAR_INPUT
-	Message : T_MaxString;//The message to log. %s is substituted with the symbolic address of this matrix.
+	Message : Tc2_System.T_MaxString; //< The message to log. %s is substituted with the symbolic address of this matrix.
 END_VAR
 ]]></Declaration>
       <Implementation>
@@ -764,7 +737,7 @@ END_VAR
       </Implementation>
     </Method>
     <Property Name="MaxVal" Id="{2e28b031-b417-0f4a-0152-01ef3cd1db57}" FolderPath="Aggregators\">
-      <Declaration><![CDATA[//Returns the maximum value from all elements
+      <Declaration><![CDATA[/// Returns the maximum value from all elements
 PROPERTY PUBLIC MaxVal : LREAL]]></Declaration>
       <Get Name="Get" Id="{f7bebe36-e3d7-072e-0310-06c7d57e73dc}">
         <Declaration><![CDATA[VAR
@@ -788,7 +761,7 @@ END_IF
       </Get>
     </Property>
     <Property Name="MinVal" Id="{02b2c522-52fd-07a2-0002-77487d44cc65}" FolderPath="Aggregators\">
-      <Declaration><![CDATA[//Returns the minimum value from all elements
+      <Declaration><![CDATA[/// Returns the minimum value from all elements
 PROPERTY PUBLIC MinVal : LREAL]]></Declaration>
       <Get Name="Get" Id="{cbaba9d2-d69b-0140-2c06-09a756014561}">
         <Declaration><![CDATA[VAR
@@ -811,23 +784,18 @@ END_IF]]></ST>
       </Get>
     </Property>
     <Method Name="Normalize" Id="{404b4c10-5aeb-0370-10b6-f0f7c656ed69}" FolderPath="Modifiers\">
-      <Declaration><![CDATA[//Scales every element of the matrix by the inverse of the magnitude.
-//
-// - Vector magnitude is determined by GetVectorMagnitude
-// - Square Matrix magnitude is determined by GetDeterminate
-// - Rectangular matricies produce an error
-//
-//:Prerequisites: 
-// - matrix is not empty
-// - matrix is not rectangular
-METHOD PUBLIC Normalize : BOOL//TRUE if the matrix was normalized. FALSE if not.
-VAR_INPUT
-END_VAR
+      <Declaration><![CDATA[/// Scales every element of the matrix by the inverse of the magnitude.
+///
+/// - Vector magnitude is determined by GetVectorMagnitude
+/// - Square Matrix magnitude is determined by GetDeterminate
+/// - Rectangular matricies produce an error
+///
+/// Prerequisites 
+/// - Matrix is not empty
+/// - Matrix is not rectangular
+METHOD PUBLIC Normalize : BOOL //< TRUE if the matrix was normalized. FALSE if not.
 VAR
 	Mag : LREAL;
-END_VAR
-VAR CONSTANT
-	
 END_VAR]]></Declaration>
       <Implementation>
         <ST><![CDATA[IF IsEmpty THEN
@@ -856,9 +824,10 @@ Scale(1/Mag);]]></ST>
       </Implementation>
     </Method>
     <Method Name="Power" Id="{554d7c44-e24f-0d64-3e72-fbca02a11c79}" FolderPath="Modifiers\">
-      <Declaration><![CDATA[//Raises every element of the matrix to the supplied power
-//
-//.. caution:: Many values of exponent could easily cause all of the elements to turn into NaN!
+      <Declaration><![CDATA[/// Raises every element of the matrix to the supplied power
+///
+/// > [!WARNING]
+/// > Many values of exponent could easily cause all of the elements to turn into NaN!
 METHOD PUBLIC Power
 VAR_INPUT
 	Exponent : LREAL;//Power with which to raise every element of the matrix
@@ -874,11 +843,11 @@ END_FOR]]></ST>
       </Implementation>
     </Method>
     <Method Name="RC2I" Id="{3fa58cb3-47e4-0750-1d7e-28cc355ab4a5}" FolderPath="Protected\">
-      <Declaration><![CDATA[//Computes the index in a row-major 1D array representing this Matrix given a supplied Row and Column index
-METHOD PROTECTED RC2I : UINT//The 0-based index of the element in the 1D array
+      <Declaration><![CDATA[/// Computes the index in a row-major 1D array representing this Matrix given a supplied Row and Column index
+METHOD PROTECTED RC2I : UINT //< The 0-based index of the element in the 1D array
 VAR_INPUT
-	Row : UINT;//The target row of the element
-	Col : UINT;//The target column of the element
+	Row : UINT; //< The target row of the element
+	Col : UINT; //< The target column of the element
 END_VAR
 ]]></Declaration>
       <Implementation>
@@ -886,12 +855,12 @@ END_VAR
       </Implementation>
     </Method>
     <Method Name="RCC2I" Id="{a76e2565-d4ef-4b3c-baf9-76f94e292fe8}" FolderPath="Protected\">
-      <Declaration><![CDATA[//Computes the index in a row-major 1D array representing a Matrix with the supplied number of columns (*NOT this matrix*) given a supplied Row and Column index
-METHOD PROTECTED RCC2I : UINT//Index of the element in a 1D array
+      <Declaration><![CDATA[/// Computes the index in a row-major 1D array representing a Matrix with the supplied number of columns (*NOT this matrix*) given a supplied Row and Column index
+METHOD PROTECTED RCC2I : UINT //< Index of the element in a 1D array
 VAR_INPUT
-	Row : UINT;//Row of the target element
-	Col : UINT;//Column fo the target element
-	ColCount : UINT;//The number of columns in the 1D array (not necessarilly the number of columns in this Matrix!)
+	Row : UINT; //< Row of the target element
+	Col : UINT; //< Column fo the target element
+	ColCount : UINT; //< The number of columns in the 1D array (not necessarilly the number of columns in this Matrix!)
 END_VAR
 ]]></Declaration>
       <Implementation>
@@ -899,7 +868,7 @@ END_VAR
       </Implementation>
     </Method>
     <Property Name="Rows" Id="{d28429c0-8643-0547-1543-63793204cffa}" FolderPath="Properties\">
-      <Declaration><![CDATA[//Total number of rows in this matrix
+      <Declaration><![CDATA[/// Total number of rows in this matrix
 PROPERTY PUBLIC ABSTRACT Rows : UINT]]></Declaration>
       <Get Name="Get" Id="{38f7288d-05a9-0a44-1ad7-57f45d3df90f}">
         <Declaration><![CDATA[VAR
@@ -911,10 +880,10 @@ END_VAR
       </Get>
     </Property>
     <Method Name="Scale" Id="{b7f3a516-3a74-41d5-8946-fd12d55e7c87}" FolderPath="Modifiers\">
-      <Declaration><![CDATA[//Scales every element of this matrix by the supplied value.
+      <Declaration><![CDATA[/// Scales every element of this matrix by the supplied value.
 METHOD PUBLIC Scale
 VAR_INPUT
-	Scalar : LREAL;//Value with which to scale every element of this matrix
+	Scalar : LREAL; //< Value with which to scale every element of this matrix
 END_VAR
 ]]></Declaration>
       <Implementation>
@@ -922,13 +891,13 @@ END_VAR
       </Implementation>
     </Method>
     <Method Name="SetI" Id="{1887d363-8acf-46d8-a10f-82241082042b}" FolderPath="Modifiers\">
-      <Declaration><![CDATA[//Sets the element specified by the supplied index to the suppleid value, assuming the data of the matrix is stored in a 1D row-major array
-//
-//:Prerequisites: - I < Rows*Cols
-METHOD PUBLIC ABSTRACT SetI : BOOL//TRUE if the specified index is valid and the data is copied. FLASE otherwise
+      <Declaration><![CDATA[/// Sets the element specified by the supplied index to the suppleid value, assuming the data of the matrix is stored in a 1D row-major array
+///
+/// Prerequisites - I < Rows*Cols
+METHOD PUBLIC ABSTRACT SetI : BOOL //< TRUE if the specified index is valid and the data is copied. FLASE otherwise
 VAR_INPUT
-	I : UINT;//The index specifying which element should be modified
-	Val : LREAL;//The value copied to the corresponding element
+	I : UINT; //< The index specifying which element should be modified
+	Val : LREAL; //< The value copied to the corresponding element
 END_VAR
 ]]></Declaration>
       <Implementation>
@@ -936,16 +905,16 @@ END_VAR
       </Implementation>
     </Method>
     <Method Name="SetRC" Id="{95b644b0-5978-469a-8c47-6f924bbad114}" FolderPath="Modifiers\">
-      <Declaration><![CDATA[//Sets the element specified by the supplied row and column to the suppleid value
-//
-//:Prerequisites:
-// - Row < Rows
-// - Col < Cols
-METHOD PUBLIC SetRC : BOOL;//TRUE if the specified row and column are valid and the data is copied. FALSE otherwise
+      <Declaration><![CDATA[/// Sets the element specified by the supplied row and column to the suppleid value
+///
+/// Prerequisites
+/// - Row < Rows
+/// - Col < Cols
+METHOD PUBLIC SetRC : BOOL; //< TRUE if the specified row and column are valid and the data is copied. FALSE otherwise
 VAR_INPUT
-	Row : UINT;//The row of the element to set
-	Col : UINT;//The column of the element to set
-	Val : LREAL;//The value to copy into the specified element
+	Row : UINT; //< The row of the element to set
+	Col : UINT; //< The column of the element to set
+	Val : LREAL; //< The value to copy into the specified element
 END_VAR
 ]]></Declaration>
       <Implementation>
@@ -964,10 +933,10 @@ END_IF]]></ST>
       </Implementation>
     </Method>
     <Method Name="SortByColAsc" Id="{ea20e01d-e4b6-07c7-3aa6-8ff1eae01e44}" FolderPath="Modifiers\">
-      <Declaration><![CDATA[//In-place bubble sort of rows by the specified col, into ascending order
-//
-//algorithm is 'stable', meaning that two equivalent rows will maintain their relative position after sorting.
-//This is nice because it lets you sort by secondary/tertiary/etc columns (if you do them in reverse)
+      <Declaration><![CDATA[/// In-place bubble sort of rows by the specified col, into ascending order
+/// 
+/// algorithm is 'stable', meaning that two equivalent rows will maintain their relative position after sorting.
+/// This is nice because it lets you sort by secondary/tertiary/etc columns (if you do them in reverse)
 METHOD PUBLIC SortByColAsc : BOOL
 VAR_INPUT
 	SortCol : UINT;
@@ -1000,7 +969,7 @@ END_REPEAT]]></ST>
       </Implementation>
     </Method>
     <Property Name="sPath" Id="{71b212c0-e2af-08e9-0666-16cfb7faa00b}" FolderPath="Properties\">
-      <Declaration><![CDATA[//The symbolic path to this matrix in memory
+      <Declaration><![CDATA[/// The symbolic path to this matrix in memory
 PROPERTY PUBLIC sPath : T_MaxString]]></Declaration>
       <Get Name="Get" Id="{5efaf036-abb9-0591-2a9d-5c04faea0e41}">
         <Declaration><![CDATA[VAR
@@ -1012,7 +981,7 @@ END_VAR
       </Get>
     </Property>
     <Property Name="Sum" Id="{26264213-af04-0fe3-15b5-fce4debe5ded}" FolderPath="Aggregators\">
-      <Declaration><![CDATA[//Returns the sum of all elements
+      <Declaration><![CDATA[/// Returns the sum of all elements
 PROPERTY PUBLIC Sum : LREAL]]></Declaration>
       <Get Name="Get" Id="{98d20894-bd36-02b2-129d-e600f0a5d072}">
         <Declaration><![CDATA[VAR
@@ -1097,14 +1066,12 @@ SwapRow := TRUE;]]></ST>
       </Implementation>
     </Method>
     <Method Name="TransposeSquare" Id="{e53a992d-b14e-03c8-244a-30c9a5ab7640}" FolderPath="Modifiers\">
-      <Declaration><![CDATA[//Transposes the matrix.
-//
-//:Prerequisites:
-//- This matrix is square
-//- This matrix is not empty
-METHOD PUBLIC TransposeSquare : BOOL//TRUE if the operation completes successfully, false if the prerequisites are not met
-VAR_INPUT
-END_VAR
+      <Declaration><![CDATA[/// Transposes the matrix.
+/// 
+/// Prerequisites
+/// - This matrix is square
+/// - This matrix is not empty
+METHOD PUBLIC TransposeSquare : BOOL //< TRUE if the operation completes successfully, false if the prerequisites are not met
 VAR
 	Temp : DynamicMatrix;
 END_VAR]]></Declaration>
@@ -1113,13 +1080,13 @@ END_VAR]]></Declaration>
       </Implementation>
     </Method>
     <Method Name="WriteDataToString" Id="{7c9446a3-69a9-08e8-3b1c-3852339b4db4}" FolderPath="Helpers\">
-      <Declaration><![CDATA[//Writes the elements of this matrix to a string in a human-readable way, up to the specified length.
-//
-//Use the GetStringLengthEstimate function to calculate how much memory is necessary to output the entire matrix to one string
-METHOD PUBLIC WriteDataToString : BOOL//Returns true if the entire matrix was written to the string, false otherwise
+      <Declaration><![CDATA[/// Writes the elements of this matrix to a string in a human-readable way, up to the specified length.
+///
+/// Use the GetStringLengthEstimate function to calculate how much memory is necessary to output the entire matrix to one string
+METHOD PUBLIC WriteDataToString : BOOL //< Returns true if the entire matrix was written to the string, false otherwise
 VAR_INPUT
-	Buffer : POINTER TO STRING;//The output buffer that should be overwritten with the contents of the matrix
-	BufferLen : UDINT;//The length, in bytes, of the output buffer available fo writing
+	Buffer : POINTER TO STRING; //< The output buffer that should be overwritten with the contents of the matrix
+	BufferLen : UDINT; //< The length, in bytes, of the output buffer available fo writing
 END_VAR
 VAR
 	Temp : STRING(32);
@@ -1175,7 +1142,7 @@ WriteDataToString := TRUE;]]></ST>
       </Implementation>
     </Method>
     <Property Name="ZeroReference" Id="{c759c62c-8641-003b-19d2-c7e06780aedd}" FolderPath="Properties\">
-      <Declaration><![CDATA[//Values with a magnitude lower than this value will be considered as zero for purposes of avoiding divide by zero errors
+      <Declaration><![CDATA[/// Values with a magnitude lower than this value will be considered as zero for purposes of avoiding divide by zero errors
 PROPERTY PUBLIC ZeroReference : LREAL]]></Declaration>
       <Get Name="Get" Id="{72e7fd1c-4821-0afe-1307-1af2cfef9288}">
         <Declaration><![CDATA[VAR
diff --git a/TcMatrix/TcMatrix/POUs/MatrixAccessors/MatrixAccessor.TcPOU b/TcMatrix/TcMatrix/POUs/MatrixAccessors/MatrixAccessor.TcPOU
index 1e60109..244b793 100644
--- a/TcMatrix/TcMatrix/POUs/MatrixAccessors/MatrixAccessor.TcPOU
+++ b/TcMatrix/TcMatrix/POUs/MatrixAccessors/MatrixAccessor.TcPOU
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.9">
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4026.11">
   <POU Name="MatrixAccessor" Id="{e50a508d-f480-0127-320a-803982deccd5}" SpecialFunc="None">
     <Declaration><![CDATA[FUNCTION_BLOCK ABSTRACT MatrixAccessor EXTENDS Matrix
-VAR_INPUT
-END_VAR
-VAR_OUTPUT
-END_VAR
 VAR
 	M_ : REFERENCE TO Matrix;
 END_VAR
@@ -17,16 +13,14 @@ END_VAR
     <Folder Name="Mapping" Id="{8ff0265d-dfed-0d78-3f8a-9dc33a327da3}" />
     <Folder Name="Overrides" Id="{8f59b246-ef31-06b6-3efd-d819bffceb36}" />
     <Method Name="GetI" Id="{673a605f-ea3d-0fd4-108f-3cd0177f6697}" FolderPath="Overrides\">
-      <Declaration><![CDATA[//Gets the value of the element in this matrix at the supplied location as if the elements were stored in a 1D row-major array
-//:Prerequisites:
-// - I < Rows*Cols
-// - Matrix is not empty
-//If the supplied index is out of bounds the value 0 is returned and a warning is generated in the Error List
-METHOD PUBLIC GetI : LREAL//The value of the element at the specified index, or 0 if an invalid index is supplied
+      <Declaration><![CDATA[/// Gets the value of the element in this matrix at the supplied location as if the elements were stored in a 1D row-major array
+/// Prerequisites
+/// - I < Rows*Cols
+/// - Matrix is not empty
+/// If the supplied index is out of bounds the value 0 is returned and a warning is generated in the Error List
+METHOD PUBLIC GetI : LREAL //< The value of the element at the specified index, or 0 if an invalid index is supplied
 VAR_INPUT
-	I : UINT;//The index of the element which should have its value returned
-END_VAR
-VAR
+	I : UINT; //< The index of the element which should have its value returned
 END_VAR]]></Declaration>
       <Implementation>
         <ST><![CDATA[IF NOT __ISVALIDREF(M_) THEN
@@ -54,12 +48,12 @@ END_VAR
       </Implementation>
     </Method>
     <Method Name="SetI" Id="{2a187707-0985-02db-070b-3fa74894917a}" FolderPath="Overrides\">
-      <Declaration><![CDATA[//Sets the element specified by the supplied index to the suppleid value, assuming the data of the matrix is stored in a 1D row-major array
-//:Prerequisites: - I < Rows*Cols
-METHOD PUBLIC SetI : BOOL//TRUE if the specified index is valid and the data is copied. FLASE otherwise
+      <Declaration><![CDATA[/// Sets the element specified by the supplied index to the suppleid value, assuming the data of the matrix is stored in a 1D row-major array
+/// Prerequisites - I < Rows*Cols
+METHOD PUBLIC SetI : BOOL //< TRUE if the specified index is valid and the data is copied. FLASE otherwise
 VAR_INPUT
-	I : UINT;//The index specifying which element should be modified
-	Val : LREAL;//The value copied to the corresponding element
+	I : UINT; //< The index specifying which element should be modified
+	Val : LREAL; //< The value copied to the corresponding element
 END_VAR
 ]]></Declaration>
       <Implementation>
diff --git a/TcMatrix/TcMatrix/POUs/MatrixAccessors/ShrunkMatrixAccessor.TcPOU b/TcMatrix/TcMatrix/POUs/MatrixAccessors/ShrunkMatrixAccessor.TcPOU
index d5ed128..de665d3 100644
--- a/TcMatrix/TcMatrix/POUs/MatrixAccessors/ShrunkMatrixAccessor.TcPOU
+++ b/TcMatrix/TcMatrix/POUs/MatrixAccessors/ShrunkMatrixAccessor.TcPOU
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.9">
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4026.11">
   <POU Name="ShrunkMatrixAccessor" Id="{f0bfcb10-4309-028c-1405-e53184e0781f}" SpecialFunc="None">
     <Declaration><![CDATA[FUNCTION_BLOCK ShrunkMatrixAccessor EXTENDS MatrixAccessor
-VAR_INPUT
-END_VAR
-VAR_OUTPUT
-END_VAR
 VAR
 	RowRemoved_ : UINT;
 	ColRemoved_ : UINT;
@@ -17,7 +13,7 @@ END_VAR
     <Folder Name="Initializers" Id="{45740341-dbbb-08f6-3340-7857963b9e64}" />
     <Folder Name="Overrides" Id="{967fd700-932b-0466-3705-406f25b48dc3}" />
     <Property Name="Cols" Id="{f3e7e618-58e0-0e81-02db-fc0fc539f3ee}" FolderPath="Overrides\">
-      <Declaration><![CDATA[//Total number of columns in this matrix
+      <Declaration><![CDATA[/// Total number of columns in this matrix
 PROPERTY PUBLIC Cols : UINT]]></Declaration>
       <Get Name="Get" Id="{1c7f5a4f-f036-0f00-0aab-5b1385b88ad9}">
         <Declaration><![CDATA[VAR
@@ -50,7 +46,7 @@ ColRemoved_ := ColRemoved;]]></ST>
       </Implementation>
     </Method>
     <Property Name="Rows" Id="{7c4ed6f3-3d01-028d-1d23-3c66c33be3ce}" FolderPath="Overrides\">
-      <Declaration><![CDATA[//Total number of rows in this matrix
+      <Declaration><![CDATA[/// Total number of rows in this matrix
 PROPERTY PUBLIC Rows : UINT]]></Declaration>
       <Get Name="Get" Id="{f08fb378-8ee8-0f98-35a7-7b3a88876ac2}">
         <Declaration><![CDATA[VAR
diff --git a/TcMatrix/TcMatrix/POUs/MatrixAccessors/SubMatrixAccessor.TcPOU b/TcMatrix/TcMatrix/POUs/MatrixAccessors/SubMatrixAccessor.TcPOU
index 753a184..3c833c7 100644
--- a/TcMatrix/TcMatrix/POUs/MatrixAccessors/SubMatrixAccessor.TcPOU
+++ b/TcMatrix/TcMatrix/POUs/MatrixAccessors/SubMatrixAccessor.TcPOU
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.9">
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4026.11">
   <POU Name="SubMatrixAccessor" Id="{837da318-dc80-05cd-2c43-97c65ce7fbf9}" SpecialFunc="None">
     <Declaration><![CDATA[FUNCTION_BLOCK SubMatrixAccessor EXTENDS MatrixAccessor
-VAR_INPUT
-END_VAR
-VAR_OUTPUT
-END_VAR
 VAR
 	RowStart_ : UINT;
 	RowCount_ : UINT;
@@ -19,7 +15,7 @@ END_VAR
     <Folder Name="Initializers" Id="{c4ff6fb8-d426-06a0-2de0-6e817d8e8673}" />
     <Folder Name="Overrides" Id="{db7b0a8d-ca29-0b51-32da-29239fddaa39}" />
     <Property Name="Cols" Id="{a38b3dd4-923d-0130-3754-ff352bbd92f6}" FolderPath="Overrides\">
-      <Declaration><![CDATA[//Total number of columns in this matrix
+      <Declaration><![CDATA[/// Total number of columns in this matrix
 PROPERTY PUBLIC Cols : UINT]]></Declaration>
       <Get Name="Get" Id="{7ed751df-7924-05b4-3c5e-07a9c0bf5d5b}">
         <Declaration><![CDATA[VAR
@@ -56,7 +52,7 @@ ColCount_ := ColCount;]]></ST>
       </Implementation>
     </Method>
     <Property Name="Rows" Id="{aee046b9-e47f-08ab-02ba-83dd133dbd4a}" FolderPath="Overrides\">
-      <Declaration><![CDATA[//Total number of rows in this matrix
+      <Declaration><![CDATA[/// Total number of rows in this matrix
 PROPERTY PUBLIC Rows : UINT]]></Declaration>
       <Get Name="Get" Id="{2e0f523c-22c0-0b7f-3ffa-dd5110d1775f}">
         <Declaration><![CDATA[VAR
diff --git a/TcMatrix/TcMatrix/POUs/MatrixAccessors/TransposeMatrixAccessor.TcPOU b/TcMatrix/TcMatrix/POUs/MatrixAccessors/TransposeMatrixAccessor.TcPOU
index 339fd52..71b1292 100644
--- a/TcMatrix/TcMatrix/POUs/MatrixAccessors/TransposeMatrixAccessor.TcPOU
+++ b/TcMatrix/TcMatrix/POUs/MatrixAccessors/TransposeMatrixAccessor.TcPOU
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.9">
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4026.11">
   <POU Name="TransposeMatrixAccessor" Id="{9a28d6e8-49de-0d4d-265c-dd2a9870f8ee}" SpecialFunc="None">
     <Declaration><![CDATA[FUNCTION_BLOCK TransposeMatrixAccessor EXTENDS MatrixAccessor
-VAR_INPUT
-END_VAR
-VAR_OUTPUT
-END_VAR
 VAR
 	RowRemoved_ : UINT;
 	ColRemoved_ : UINT;
@@ -17,7 +13,7 @@ END_VAR
     <Folder Name="Initializers" Id="{7c0114cd-41d1-0d49-1cd5-8a0554f73bcf}" />
     <Folder Name="Overrides" Id="{c3ed05e4-8f1f-022e-21ba-86d9c4d0a320}" />
     <Property Name="Cols" Id="{bf0da9f9-be70-0115-3902-7943e66150d7}" FolderPath="Overrides\">
-      <Declaration><![CDATA[//Total number of columns in this matrix
+      <Declaration><![CDATA[/// Total number of columns in this matrix
 PROPERTY PUBLIC Cols : UINT]]></Declaration>
       <Get Name="Get" Id="{cb7fdd63-8d83-06fd-2e61-15e9782a8d8f}">
         <Declaration><![CDATA[VAR
@@ -44,7 +40,7 @@ END_VAR
       </Implementation>
     </Method>
     <Property Name="Rows" Id="{5191cf39-179d-048b-094b-53b45da5d542}" FolderPath="Overrides\">
-      <Declaration><![CDATA[//Total number of rows in this matrix
+      <Declaration><![CDATA[/// Total number of rows in this matrix
 PROPERTY PUBLIC Rows : UINT]]></Declaration>
       <Get Name="Get" Id="{f7be0edf-342d-0112-1abb-ce9cd40f7cf7}">
         <Declaration><![CDATA[VAR
diff --git a/TcMatrix/TcMatrix/POUs/StaticMatrix.TcPOU b/TcMatrix/TcMatrix/POUs/StaticMatrix.TcPOU
index 75b5597..e0b5d0e 100644
--- a/TcMatrix/TcMatrix/POUs/StaticMatrix.TcPOU
+++ b/TcMatrix/TcMatrix/POUs/StaticMatrix.TcPOU
@@ -1,21 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.9">
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4026.11">
   <POU Name="StaticMatrix" Id="{d79dcd61-649c-042a-2c3d-c130631ac3c2}" SpecialFunc="None">
-    <Declaration><![CDATA[(*
-Derived class must:
-- Declare a VAR array of LREAL named Data_
-- Call Init_ in FB_init, pointing to the local arrays, with Rows and Cols such that Rows*Cols <= Length(Data_)
-*)
+    <Declaration><![CDATA[/// Derived class must:
+/// Declare a VAR array of LREAL named Data_
+/// - Call Init_ in FB_init, pointing to the local arrays, with Rows and Cols such that Rows*Cols <= Length(Data_)
 {attribute 'reflection'}
 {attribute 'no_assign'}
 FUNCTION_BLOCK ABSTRACT StaticMatrix EXTENDS Matrix
-VAR_INPUT
-END_VAR
-VAR_OUTPUT
-END_VAR
 VAR
-	Rows_ : UINT := 0;
-	Cols_ : UINT := 0;
+  Rows_ : UINT := 0;
+  Cols_ : UINT := 0;
 END_VAR
 ]]></Declaration>
     <Implementation>
@@ -24,7 +18,7 @@ END_VAR
     <Folder Name="Initialziers" Id="{08f59030-94f7-0073-0a6e-d3e1830889b4}" />
     <Folder Name="Overrides" Id="{ae8f9fd6-d618-01fa-1ea5-e735cb12e13d}" />
     <Property Name="Cols" Id="{cefe6429-a672-0a6c-0720-70da52f990a4}" FolderPath="Overrides\">
-      <Declaration><![CDATA[//Total number of columns in this matrix
+      <Declaration><![CDATA[/// Total number of columns in this matrix
 PROPERTY PUBLIC Cols : UINT]]></Declaration>
       <Get Name="Get" Id="{19a27711-2729-023c-0ff4-6a64ec484c7e}">
         <Declaration><![CDATA[VAR
@@ -48,7 +42,7 @@ Cols_ := ColCount;]]></ST>
       </Implementation>
     </Method>
     <Property Name="Rows" Id="{d7666184-3fb7-0897-1633-3a18d91e3046}" FolderPath="Overrides\">
-      <Declaration><![CDATA[//Total number of rows in this matrix
+      <Declaration><![CDATA[/// Total number of rows in this matrix
 PROPERTY PUBLIC Rows : UINT]]></Declaration>
       <Get Name="Get" Id="{79065fd2-fc3e-00cb-257e-499471f5c52d}">
         <Declaration><![CDATA[VAR