Index: firmware/.cproject
===================================================================
diff -u -r6533723d00423647f348cf00dfcebb24c948da9d -rfb4b4a4f9d16742bfb76f62970a43c97e1ac14f0
--- firmware/.cproject	(.../.cproject)	(revision 6533723d00423647f348cf00dfcebb24c948da9d)
+++ firmware/.cproject	(.../.cproject)	(revision fb4b4a4f9d16742bfb76f62970a43c97e1ac14f0)
@@ -15,7 +15,7 @@
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 				<configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" id="com.ti.ccstudio.buildDefinitions.TMS470.Debug.1939553624" name="Debug" parent="com.ti.ccstudio.buildDefinitions.TMS470.Debug">
 					<folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Debug.1939553624." name="/" resourcePath="">
-						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.exe.DebugToolchain.516134309" name="TI Build Tools" secondaryOutputs="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.outputType__BIN" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.12.exe.linkerDebug.150797795">
+						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.exe.DebugToolchain.516134309" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.12.exe.linkerDebug.150797795">
 							<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.329041903" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
 								<listOptionValue builtIn="false" value="DEVICE_CONFIGURATION_ID=Cortex R.RM46L852"/>
 								<listOptionValue builtIn="false" value="DEVICE_ENDIANNESS=little"/>
@@ -85,7 +85,7 @@
 								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.exeLinker.inputType__GEN_CMDS.924223878" name="Generated Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.exeLinker.inputType__GEN_CMDS"/>
 							</tool>
 							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.2013023693" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.TOOL_ENABLE.1951950315" name="Enable tool" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.TOOL_ENABLE" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.TOOL_ENABLE.1951950315" name="Enable tool" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.TOOL_ENABLE" value="false" valueType="boolean"/>
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.ENTRYPOINT.1141779907" name="Specify entrypoint address or symbol name (--entrypoint, -e=addr)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.ENTRYPOINT" value="_c_int00" valueType="string"/>
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.ROMWIDTH.1669015423" name="Specify rom width (--romwidth, -romwidth=width)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.hex.ROMWIDTH" value="32" valueType="string"/>
 								<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"/>
Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r6533723d00423647f348cf00dfcebb24c948da9d -rfb4b4a4f9d16742bfb76f62970a43c97e1ac14f0
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 6533723d00423647f348cf00dfcebb24c948da9d)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision fb4b4a4f9d16742bfb76f62970a43c97e1ac14f0)
@@ -223,7 +223,7 @@
  *************************************************************************/
 F32 getUltrafiltrationVolumeCollected( void )
 {
-    F32 result = measUFVolume + measUFVolumeFromPriorReservoirs;
+    F32 result = measUFVolume;
 
     return result;
 }
Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -rade19b8aa4c3b60cdda4028871ef009b01368948 -rfb4b4a4f9d16742bfb76f62970a43c97e1ac14f0
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision ade19b8aa4c3b60cdda4028871ef009b01368948)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision fb4b4a4f9d16742bfb76f62970a43c97e1ac14f0)
@@ -682,20 +682,29 @@
 {
     if ( ++treatmentParamsRangesBroadcastTimerCtr >= TREATMENT_SETTINGS_RANGES_PUB_INTERVAL )
     {
+        // compute minimum treatment duration
         U32 minTime = CALC_ELAPSED_TREAT_TIME_IN_MIN() + 2;  // add two minutes to cover rounding and ensure it's valid for next minute
-        U32 maxTimeRem = ( MAX_UF_VOLUME_ML - (U32)getUltrafiltrationVolumeCollected() ) / MAX_UF_RATE_ML_MIN;
+        // compute maximum treatment duration (from both UF and dialysate volume perspectives)
+        U32 maxTimeRem = ( MAX_UF_VOLUME_ML - (U32)getUltrafiltrationVolumeCollected() ) / ( presUFRate > 0.0 ? (U32)presUFRate : 1 );
         U32 maxTime1 = minTime + maxTimeRem;
         U32 maxTime2 = MAX_DIALYSATE_VOLUME_ML / presDialysateFlowRate;
         U32 maxTime = MIN( maxTime1, maxTime2 );
-        U32 minUFVol = (U32)(getUltrafiltrationVolumeCollected() + 1);
-        U32 maxUFVol = presUFRate * ( presTreatmentTimeSecs / SEC_PER_MIN );
+        // compute minimum UF volume
+        U32 minUFVol = (U32)(getUltrafiltrationVolumeCollected());
+        // compute maximum UF volume (considering from adjustment of treatment duration or UF rate perspectives)
+        U32 maxUFVol1 = minUFVol + ( ( CALC_TREAT_TIME_REMAINING_IN_SECS() / SEC_PER_MIN ) * MAX_UF_RATE_ML_MIN );
+        U32 maxUFVol2 = ( presUFRate > 0 ? minUFVol + (U32)( ( MAX_TREATMENT_TIME_MINUTES - CALC_ELAPSED_TREAT_TIME_IN_MIN() - 1 ) * presUFRate ) : MAX_UF_VOLUME_ML );
+        U32 maxUFVol = MIN( maxUFVol1, maxUFVol2 );
+        // compute minimum dialysate flow rate
         U32 minDialRate = MIN_DIAL_IN_FLOW_RATE;
+        // compute maximum dialysate flow rate from max dialysate volume perspective
         U32 maxDialRate = MAX_DIALYSATE_VOLUME_ML / ( presTreatmentTimeSecs / SEC_PER_MIN );
 
+        // now ensure maximums do not exceed the literal maximums
         maxTime = MIN( maxTime, MAX_TREATMENT_TIME_MINUTES );
         maxUFVol = MIN( maxUFVol, MAX_UF_VOLUME_ML );
         maxDialRate = MIN( maxDialRate, MAX_DIAL_IN_FLOW_RATE );
-        // send ranges to UI
+        // send updated treatment parameter ranges to UI
         sendTreatmentParamsRangesToUI( minTime, maxTime, minUFVol, maxUFVol, minDialRate, maxDialRate );
         treatmentParamsRangesBroadcastTimerCtr = 0;
     }
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rd3e3e25740d545eb958a595e87fa3034633e7392 -rfb4b4a4f9d16742bfb76f62970a43c97e1ac14f0
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision d3e3e25740d545eb958a595e87fa3034633e7392)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision fb4b4a4f9d16742bfb76f62970a43c97e1ac14f0)
@@ -405,11 +405,11 @@
  *************************************************************************/
 void handleChangeUFSettingsRequest( MESSAGE_T *message )
 {
-    if ( message->hdr.payloadLen == sizeof(U32) )
+    if ( message->hdr.payloadLen == sizeof(F32) )
     {
-        U32 uFVolume;
+        F32 uFVolume;
 
-        memcpy( &uFVolume, message->payload, sizeof(U32) );
+        memcpy( &uFVolume, message->payload, sizeof(F32) );
 
         verifyUFSettingsChange( uFVolume );
     }
@@ -682,7 +682,7 @@
  * @param message : a pointer to the message to handle.
  * @return none
  *************************************************************************/
-void handleFWVersionRequest( message )
+void handleFWVersionRequest( MESSAGE_T *message )
 {
     MESSAGE_T msg;
     U08 major = (U08)HD_VERSION_MAJOR;
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rd3e3e25740d545eb958a595e87fa3034633e7392 -rfb4b4a4f9d16742bfb76f62970a43c97e1ac14f0
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision d3e3e25740d545eb958a595e87fa3034633e7392)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision fb4b4a4f9d16742bfb76f62970a43c97e1ac14f0)
@@ -67,7 +67,7 @@
 BOOL sendDialysateTempTargetsToDG( F32 primary, F32 trimmer );
 
 // MSG_ID_REQUEST_FW_VERSIONS
-void handleFWVersionRequest( message );
+void handleFWVersionRequest( MESSAGE_T *message );
 
 // MSG_ID_ALARM_STATUS
 BOOL broadcastAlarmStatus( COMP_ALARM_STATUS_T almStatus );