Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rc44e496a684e4ff1c1a19389873a46fd8181334e -r150ea9e4d24f2cb555495749b095d270013c30bb
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision c44e496a684e4ff1c1a19389873a46fd8181334e)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 150ea9e4d24f2cb555495749b095d270013c30bb)
@@ -586,8 +586,8 @@
  * The handleTestInletWaterState function tests for inlet water quality
  * and if this is the first fill of a treatment, prime the acid and bicarb
  * lines before jumping to dialysate production state.
- * @details Inputs: Temperature, pressure, and conductivity alarms
- * @details Outputs: request acid and bicarb pumps on
+ * @details Inputs: none
+ * @details Outputs: none
  * @return the next state
  *************************************************************************/
 static DG_FILL_MODE_STATE_T handleTestInletWaterState( void )
@@ -614,7 +614,7 @@
  * @brief
  * The handlePrimeConcentrateLinesState function primes the acid and bicarb
  * lines.
- * @details Inputs: None
+ * @details Inputs: concentratePrimingStartTime
  * @details Outputs: None
  * @return the next state
  *************************************************************************/
@@ -993,16 +993,21 @@
  * @brief
  * The setModeFillStateTransition function sets the actuators and variables
  * for the state transition in mode fill.
- * @details Inputs: none
- * @details Outputs: concPumpPrimeStartTimeMS, fillStatus
+ * @details Inputs: pumpSpeedIndex, havePauseActuatorsBeenSet
+ * @details Outputs: concPumpPrimeStartTimeMS, fillStatus, pumpSpeedIndex,
+ * concentratePrimingStartTime, totalBicarbConductivity, averageBicarbConductivity,
+ * bicarbConductivitySampleCount, concentrateTestStartTime, fillStatus,
+ * havePauseActuatorsBeenSet, flushBubblesStartTime
  * @param state mode fill state enum
  * @return none
  *************************************************************************/
 static void setModeFillStateTransition( DG_FILL_MODE_STATE_T state )
 {
     switch( state )
     {
+        case DG_FILL_MODE_STATE_START:
         case DG_FILL_MODE_STATE_TEST_INLET_WATER:
+            // Do nothing
             break;
 
         case DG_FILL_MODE_STATE_PRIME_CONCENTRATE_LINES:
@@ -1028,7 +1033,6 @@
         case DG_FILL_MODE_STATE_TEST_BICARB_CONDUCTIVITY:
             // Set pumps flow rate to prepare for bicarb conductivity testing
             setROPumpTargetFlowRateLPM( RO_PUMP_800_ML_PER_MIN / MILLILITERS_PER_LITER, TARGET_RO_PRESSURE_PSI );
-
             setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, BICARB_PUMP_40_ML_PER_MIN );
             requestConcentratePumpOn( CONCENTRATEPUMPS_CP2_BICARB );
 
@@ -1084,7 +1088,7 @@
             break;
 
         default:
-            // Do nothing. Prime state out of range is controlled in the exec function
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_FILL_MODE_INVALID_EXEC_STATE, state )
             break;
     }
 }