Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -r92c04526739f32e904fe258bd622aa08734ce343 -rb4bc2e0337b358ee180650101d98e18346bf7c22
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 92c04526739f32e904fe258bd622aa08734ce343)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision b4bc2e0337b358ee180650101d98e18346bf7c22)
@@ -164,6 +164,8 @@
             break;
 
         default:
+            currentPostTreatmentState = HD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE;
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_POST_TREATMENT_INVALID_STATE, currentPostTreatmentState );
             break;
     }
 
@@ -407,10 +409,10 @@
 /*********************************************************************//**
  * @brief
  * The handleDrainReservoirOneState function sends command to DG to
- * drain reservoir one.
+ * drain first reservoir.
  * @details Inputs: none
  * @details Outputs: drained reservoir one
- * @return current state (sub-mode)
+ * @return next state
  *************************************************************************/
 static DRAIN_STATE_T handleDrainFirstReservoirStartState( void )
 {
@@ -425,6 +427,14 @@
     return state;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The handleDrainFirstReservoirState function waits for DG to finish draining
+ * first reservoir and sends command to switch reservoir.
+ * @details Inputs: none
+ * @details Outputs: drained first reservoir
+ * @return next state
+ *************************************************************************/
 static DRAIN_STATE_T handleDrainFirstReservoirState( void )
 {
     DG_CMD_RESPONSE_T dgCmdResp;
@@ -454,6 +464,14 @@
     return state;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The handleDrainSwitchReservoirState function waits for DG to complete
+ * reservoir switch and sends drain command.
+ * @details Inputs: none
+ * @details Outputs: proceed to next state after DG switched reservoir
+ * @return next state
+ *************************************************************************/
 static DRAIN_STATE_T handleDrainSwitchReservoirState( void )
 {
     DRAIN_STATE_T state = DRAIN_SWITCH_RESERVOIR_STATE;
@@ -469,11 +487,11 @@
 
 /*********************************************************************//**
  * @brief
- * The handleDrainReservoirTwoState function sends command to DG to drain
- * reservoir two.
+ * The handleDrainReservoirTwoState function waits for DG to finish draining
+ * second reservoir.
  * @details Inputs: none
- * @details Outputs: drained reservoir two
- * @return current state (sub-mode)
+ * @details Outputs: drained second reservoir
+ * @return next state
  *************************************************************************/
 static DRAIN_STATE_T handleDrainSecondReservoirState( void )
 {