Index: firmware/.cproject
===================================================================
diff -u -rd3e3e25740d545eb958a595e87fa3034633e7392 -r6533723d00423647f348cf00dfcebb24c948da9d
--- firmware/.cproject	(.../.cproject)	(revision d3e3e25740d545eb958a595e87fa3034633e7392)
+++ firmware/.cproject	(.../.cproject)	(revision 6533723d00423647f348cf00dfcebb24c948da9d)
@@ -66,8 +66,8 @@
 								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compiler.inputType__ASM2_SRCS.836328511" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compiler.inputType__ASM2_SRCS"/>
 							</tool>
 							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.exe.linkerDebug.150797795" name="ARM Linker" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.exe.linkerDebug">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.linkerID.HEAP_SIZE.270592357" name="Heap size for C/C++ dynamic memory allocation (--heap_size, -heap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.linkerID.HEAP_SIZE" value="0x800" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.linkerID.STACK_SIZE.114019599" name="Set C system stack size (--stack_size, -stack)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.linkerID.STACK_SIZE" value="0x800" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.linkerID.HEAP_SIZE.270592357" name="Heap size for C/C++ dynamic memory allocation (--heap_size, -heap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.linkerID.HEAP_SIZE" value="0x100" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.linkerID.STACK_SIZE.114019599" name="Set C system stack size (--stack_size, -stack)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.linkerID.STACK_SIZE" value="0x1000" valueType="string"/>
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.linkerID.MAP_FILE.1736659389" name="Link information (map) listed into &lt;file&gt; (--map_file, -m)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.linkerID.MAP_FILE" value="${ProjName}.map" valueType="string"/>
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.linkerID.OUTPUT_FILE.430964439" name="Specify output file name (--output_file, -o)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.linkerID.OUTPUT_FILE" value="${ProjName}.out" valueType="string"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.linkerID.LIBRARY.1046752999" name="Include library file or command file as input (--library, -l)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.linkerID.LIBRARY" valueType="libs">
@@ -91,8 +91,11 @@
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.MEMWIDTH.992519037" name="Specify memory width (--memwidth, -memwidth=width)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.MEMWIDTH" value="" valueType="string"/>
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.ZERO.1894192775" name="Zero based addressing (--zero, -zero, -z)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.ZERO" value="false" valueType="boolean"/>
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.OUTPUT_FORMAT.1099086463" name="Output format" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.OUTPUT_FORMAT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.OUTPUT_FORMAT.INTEL" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.FILL.1712541309" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.FILL" value="0xFF" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.LINKERFILL.135827723" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.LINKERFILL" value="false" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.FILL.1712541309" name="Specify fill value (--fill, -fill=val)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.FILL" value="0xFF" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.LINKERFILL.135827723" name="Include linker fill sections in images (--linkerfill, -linkerfill)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.LINKERFILL" value="false" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.LOAD_IMAGE:ENDIAN.1218588347" name="Specify the object file endianness (--load_image:endian)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.LOAD_IMAGE:ENDIAN" value="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.LOAD_IMAGE:ENDIAN._none" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.LOAD_IMAGE:FILE_TYPE.2135007665" name="Specify the output file type (--load_image:file_type)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.LOAD_IMAGE:FILE_TYPE" value="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.LOAD_IMAGE:FILE_TYPE._none" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.LOAD_IMAGE:OUTPUT_SYMBOLS.725079835" name="Specify if symbols should be output to the file. (--load_image:output_symbols)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.LOAD_IMAGE:OUTPUT_SYMBOLS" value="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.LOAD_IMAGE:OUTPUT_SYMBOLS._none" valueType="enumerated"/>
 							</tool>
 						</toolChain>
 					</folderInfo>
Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -rade19b8aa4c3b60cdda4028871ef009b01368948 -r6533723d00423647f348cf00dfcebb24c948da9d
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision ade19b8aa4c3b60cdda4028871ef009b01368948)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 6533723d00423647f348cf00dfcebb24c948da9d)
@@ -67,7 +67,7 @@
 static UF_STATE_T handleUFOffState( void );
 static UF_STATE_T handleUFCompletedState( void );
 
-static void checkUF( void );
+static void checkUFAccuracyAndVolume( void );
 static void updateUFVolumes( void );
 
 /*********************************************************************//**
@@ -301,7 +301,7 @@
 void execDialysis( void )
 {
     // check ultrafiltration max rate and accuracy during dialysis (even when ultrafiltration is paused).
-    checkUF();
+    checkUFAccuracyAndVolume();
 
     // dialysis state machine
     switch ( currentDialysisState )
@@ -526,7 +526,7 @@
  * Outputs : uFAccuracyCheckTimerCtr, lastUFVolumeChecked
  * @return none
  *************************************************************************/
-static void checkUF( void )
+static void checkUFAccuracyAndVolume( void )
 {
     // check UF accuracy at 1 minute intervals
     if ( ++uFAccuracyCheckTimerCtr >= UF_ACCURACY_CHECK_INTERVAL )
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rade19b8aa4c3b60cdda4028871ef009b01368948 -r6533723d00423647f348cf00dfcebb24c948da9d
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision ade19b8aa4c3b60cdda4028871ef009b01368948)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 6533723d00423647f348cf00dfcebb24c948da9d)
@@ -54,7 +54,7 @@
 #define MAX_COMM_CRC_FAILURES           5
 #define MAX_COMM_CRC_FAILURE_WINDOW_MS  (10 * SEC_PER_MIN * MS_PER_SECOND)
 
-#define MSG_NOT_ACKED_TIMEOUT_MS        120
+#define MSG_NOT_ACKED_TIMEOUT_MS        150
 #define MSG_NOT_ACKED_MAX_RETRIES       3
 #define PENDING_ACK_LIST_SIZE           25