Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r53ded5e26646574d5bae2cebd5de47a2ac5a3c2d -r104bd9ab84f7619fe04670a5cee37638e30f5a39
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 53ded5e26646574d5bae2cebd5de47a2ac5a3c2d)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 104bd9ab84f7619fe04670a5cee37638e30f5a39)
@@ -46,7 +46,7 @@
 // ********** private function prototypes **********
 
 static void setPreTreatStateTransition( void );                                 ///< Configure actuators and variables for Pre-Treatment state transitions.
-static TD_PRE_TREATMENT_MODE_STATE_T handleInstallState( void );                ///< Handle Instll state during Pre-Treatment
+static TD_PRE_TREATMENT_MODE_STATE_T handleInstallState( void );                ///< Handle Install state during Pre-Treatment
 static TD_PRE_TREATMENT_MODE_STATE_T handleSelfTestDryState( void );            ///< Handle Self Test Dry state during Pre-Treatment
 static TD_PRE_TREATMENT_MODE_STATE_T handlePrimeState( void );                  ///< Handle Prime state during Pre-Treatment
 static TD_PRE_TREATMENT_MODE_STATE_T handleRecirculateState( void );            ///< Handle Recirculate state during Pre-Treatment
@@ -232,7 +232,7 @@
 
     if ( TRUE == isTubeSetInstallComplete() )
     {
-        state = TD_PRE_TREATMENT_CONFIRM_RX_STATE;
+        state = TD_PRE_TREATMENT_SELF_TEST_DRY_STATE;
     }
 
     return state;
@@ -327,7 +327,6 @@
     {
         continueFromHeparinSetupRequested = FALSE;
         state = TD_PRE_TREATMENT_PATIENT_CONNECTION_STATE;
-
     }
 
     return state;
@@ -358,7 +357,6 @@
     // Valid + confirmed – move to Heparin Setup or Patient Connection.
     if ( ( TRUE == paramsValid ) && ( TRUE == paramsConfirmed ) )
     {
-        // TODO this command of requesting dialysate delivery will move to appropriate state in pre-treatment once implemented
         if ( ( ddOpMode == DD_MODE_PREG ) && ( ddSubMode == DD_PRE_GEN_DIALYSATE_WAIT_FOR_GEND ) )
         {
             presUFVolumeL = getTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME );