Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rd7cd6f90ebd24645b4f6b60a36a9bdc2d6f1c95f -rf847ac4a7a0a080c4b62886243f5b863c4e7730d
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision d7cd6f90ebd24645b4f6b60a36a9bdc2d6f1c95f)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision f847ac4a7a0a080c4b62886243f5b863c4e7730d)
@@ -7,8 +7,8 @@
 *
 * @file    ModeFill.c
 *
-* @author  (last)      James Walter Taylor
-* @date    (last)      13-Sep-2023
+* @author  (last)      Dara Navaei
+* @date    (last)      20-Sep-2023
 *
 * @author  (original)  Leonardo Baloa
 * @date    (original)  19-Nov-2019
@@ -80,7 +80,7 @@
 
 // 2m long tubing to cap = 19.5 mL (acid line) + 7.92 mL/m * 2 m (tubing to cap) + 20.82 mL (straw) = 56.15 mL
 // Prime time in seconds = ( 56.15 mL / 48 mL/min ) x 60 second/min + 25 seconds margin time = 95 seconds.
-#define PRIME_CONCENTRATE_LINES_TIME_OUT_MS             ( 60 * MS_PER_SECOND )                               ///< Time required to prime the concentrate lines.
+#define PRIME_CONCENTRATE_LINES_TIME_OUT_MS             ( 95 * MS_PER_SECOND )                               ///< Time required to prime the concentrate lines.
 #define FLUSH_BUBBLES_PUMP_TIME_OUT_MS                  ( 2  * MS_PER_SECOND )                               ///< RO pump on during flush bubble interval in ms.
 #define DIALYSATE_TEMPERATURE_TOLERANCE_C               2.0F                                                 ///< Dialysate temperature tolerance in degree C.
 #define DATA_PUBLISH_COUNTER_START_COUNT                63                                                   ///< Data publish counter start count.
@@ -1173,7 +1173,9 @@
  * percentFactor.
  * @details Inputs: None
  * @details Outputs: None
- * @param: testValue, baseValue, percentFactor
+ * @param testValue value to check range for
+ * @param baseValue value associated with 100%
+ * @param percentFactor percentage range (100% +/- this value)
  * @return TRUE if testValue is within range.  Otherwise, return FALSE
  *************************************************************************/
 static BOOL isValueWithinPercentRange( F32 testValue, F32 baseValue, F32 percentFactor )
@@ -1264,7 +1266,7 @@
  * acid volume.
  * @details Inputs: used acid volume
  * @details Outputs: used acid volume
- * @param: value : override used acid volume in mL
+ * @param value override used acid volume in mL
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetUsedAcidVolumeMLOverride( F32 value )
@@ -1312,7 +1314,7 @@
  * bicarb volume.
  * @details Inputs: used bicarb volume
  * @details Outputs: used bicarb volume
- * @param: value : override used bicarb volume in mL
+ * @param value override used bicarb volume in mL
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetUsedBicarbVolumeMLOverride( F32 value )
@@ -1360,7 +1362,7 @@
  * fill mode data publish interval.
  * @details Inputs: FillModeDataPublishInterval
  * @details Outputs: FillModeDataPublishInterval
- * @param: value override fill mode data publish interval with (in ms)
+ * @param value override fill mode data publish interval with (in ms)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetFillModeDataPublishIntervalOverride( U32 value )
@@ -1406,7 +1408,7 @@
  * integrated volume.
  * @details Inputs: value
  * @details Outputs: integratedVolumeML
- * @param: value integrated volume in mL
+ * @param value integrated volume in mL
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetIntegratedVolumeOverride( F32 value )