diff --git a/docs/EN_US/ConfiguringHPCC/ConfiguringHPCC.xml b/docs/EN_US/ConfiguringHPCC/ConfiguringHPCC.xml
index 511ce4dabfe..3dff4ff3f4e 100644
--- a/docs/EN_US/ConfiguringHPCC/ConfiguringHPCC.xml
+++ b/docs/EN_US/ConfiguringHPCC/ConfiguringHPCC.xml
@@ -37,7 +37,7 @@
       similarity to actual persons, living or dead, is purely
       coincidental.</para>
 
-      <para></para>
+      <para />
     </legalnotice>
 
     <xi:include href="common/Version.xml"
@@ -436,10 +436,9 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
           <para>If it is running, stop the HPCC system using this command on
           every node:</para>
 
-                     <xi:include href="Installing_and_RunningTheHPCCPlatform/Inst-Mods/SysDStop.xml"
-	                          xpointer="element(/1)"
-	                          xmlns:xi="http://www.w3.org/2001/XInclude" />
-
+          <xi:include href="Installing_and_RunningTheHPCCPlatform/Inst-Mods/SysDStop.xml"
+                      xpointer="element(/1)"
+                      xmlns:xi="http://www.w3.org/2001/XInclude" />
 
           <variablelist>
             <varlistentry>
@@ -469,7 +468,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
                     fileref="images/OSSgr3.png" /></entry>
 
                     <entry>You can use this command to confirm HPCC processes
-                    are stopped: <para><programlisting>sudo /etc/init.d/hpcc-init status</programlisting></para></entry>
+                    are stopped: <para><programlisting>sudo systemctl status hpccsystems-platform.target</programlisting></para></entry>
                   </row>
                 </tbody>
               </tgroup>
@@ -1790,8 +1789,8 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
               <listitem>
                 <para>In the <emphasis>kibanaEntryPointURI</emphasis> field,
-                enter the Kibana URI pointing to your shared Kibana dashboard.
-                </para>
+                enter the Kibana URI pointing to your shared Kibana
+                dashboard.</para>
 
                 <para>For example: /app/kibana#/dashboard/etc. (obtained from
                 the "share" tab in Kibana)</para>
@@ -2556,22 +2555,27 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
             </varlistentry>
           </variablelist>
         </sect3>
+
         <sect3>
           <title>Redundancy</title>
+
           <para>Roxie can be configured to utilize a few different redundancy
           models. <itemizedlist>
               <listitem>
                 <para>Simple Redundancy - One channel per slave. Most commonly
                 used for a single node Roxie.</para>
               </listitem>
+
               <listitem>
                 <para>Full Redundancy - More slaves than the number of
                 channels. Multiple slaves host each channel.</para>
               </listitem>
+
               <listitem>
                 <para>Overloaded Redundancy - There are multiple channels per
                 slave.</para>
               </listitem>
+
               <listitem>
                 <para>Cyclic Redundancy - Each node hosts multiple channels in
                 rotation. The most commonly used configuration.</para>
diff --git a/docs/EN_US/DynamicESDL/DynamicESDL_Includer.xml b/docs/EN_US/DynamicESDL/DynamicESDL_Includer.xml
index ef4da578ee3..8a4f92c4a95 100644
--- a/docs/EN_US/DynamicESDL/DynamicESDL_Includer.xml
+++ b/docs/EN_US/DynamicESDL/DynamicESDL_Includer.xml
@@ -37,7 +37,7 @@
       similarity to actual persons, living or dead, is purely
       coincidental.</para>
 
-      <para></para>
+      <para />
     </legalnotice>
 
     <xi:include href="common/Version.xml"
@@ -221,10 +221,9 @@
           <para>If it is running, stop the HPCC system, using this command in
           a terminal window:</para>
 
-                     <xi:include href="Installing_and_RunningTheHPCCPlatform/Inst-Mods/SysDStop.xml"
-	                          xpointer="element(/1)"
-	                          xmlns:xi="http://www.w3.org/2001/XInclude" />
-
+          <xi:include href="Installing_and_RunningTheHPCCPlatform/Inst-Mods/SysDStop.xml"
+                      xpointer="element(/1)"
+                      xmlns:xi="http://www.w3.org/2001/XInclude" />
 
           <para><informaltable colsep="1" frame="all" rowsep="1">
               <?dbfo keep-together="always"?>
@@ -240,7 +239,7 @@
                     fileref="images/OSSgr3.png" /></entry>
 
                     <entry>You can use this command to confirm HPCC processes
-                    are stopped:<para> <programlisting>sudo /etc/init.d/hpcc-init status</programlisting>
+                    are stopped:<para> <programlisting>sudo systemctl status hpccsystems-platform.target</programlisting>
                     </para></entry>
                   </row>
                 </tbody>
@@ -392,10 +391,9 @@ sudo cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/environment.
           role="bold">every</emphasis> node. The following command starts the
           HPCC system on an individual node:</para>
 
-                     <xi:include href="Installing_and_RunningTheHPCCPlatform/Inst-Mods/SysDStart.xml"
-	                          xpointer="element(/1)"
-	                          xmlns:xi="http://www.w3.org/2001/XInclude" />
-
+          <xi:include href="Installing_and_RunningTheHPCCPlatform/Inst-Mods/SysDStart.xml"
+                      xpointer="element(/1)"
+                      xmlns:xi="http://www.w3.org/2001/XInclude" />
 
           <para></para>
 
@@ -414,10 +412,10 @@ sudo cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/environment.
                   <entry><para>You may want to create a script to push this
                   command out to every node. A sample script is provided with
                   HPCC. Use the following command to start HPCC on all
-                  nodes:</para>            <xi:include href="Installing_and_RunningTheHPCCPlatform/Inst-Mods/SysDStart.xml"
-                        xpointer="element(/1)"
-                        xmlns:xi="http://www.w3.org/2001/XInclude" />
-</entry>
+                  nodes:</para> <xi:include
+                  href="Installing_and_RunningTheHPCCPlatform/Inst-Mods/SysDStart.xml"
+                  xpointer="element(/1)"
+                  xmlns:xi="http://www.w3.org/2001/XInclude" /></entry>
                 </row>
               </tbody>
             </tgroup>
@@ -655,10 +653,11 @@ ds_out := ROW ({res},MathService.MathService.t_AddThisResponse);
 OUTPUT(ds_out, NAMED('AddThisResponse')); </programlisting>
           </listitem>
 
-          <listitem><?dbfo keep-together="always"?>
-            <para>Using the <emphasis
-            role="bold">Target</emphasis> drop list, select
-            <emphasis>Roxie</emphasis> as the Target cluster.</para>
+          <listitem>
+            <?dbfo keep-together="always"?>
+
+            <para>Using the <emphasis role="bold">Target</emphasis> drop list,
+            select <emphasis>Roxie</emphasis> as the Target cluster.</para>
 
             <para><figure>
                 <title>Target Roxie</title>
diff --git a/docs/EN_US/images/GS_CMWiz003.jpg b/docs/EN_US/images/GS_CMWiz003.jpg
index 5166ad133ef..f193efe7265 100644
Binary files a/docs/EN_US/images/GS_CMWiz003.jpg and b/docs/EN_US/images/GS_CMWiz003.jpg differ