Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -r09e6cf9de34acf18f6e1138bf56ac0edb4821186 -r83d46d8b27ff7e2452d3f20b423289d03df5757d
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 09e6cf9de34acf18f6e1138bf56ac0edb4821186)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 83d46d8b27ff7e2452d3f20b423289d03df5757d)
@@ -229,8 +229,13 @@
     treatmentLogData.dialysateVolumeUsed_L = treatmentLogData.avgDialysateFlow_mL_min * treatmentLogData.actualTreatmentDur_sec / ( ML_PER_LITER * SEC_PER_MIN );
     treatmentLogData.avgDialysateTemperature_degC = getTreatmentAvgDialysateTemp();
 
+    // original UF Volume/Rate
+    treatmentLogData.originUFVolume_L = getUltrafiltrationVolumeOriginal();
+    treatmentLogData.originUFRate_mL_min = getUltrafiltrationRateOriginal();
+    // Target UF Volume/Rate
     treatmentLogData.targetUFVolume_L = getTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME );
-    treatmentLogData.targetUFRate_mL_min = getTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME ) * ML_PER_LITER * SEC_PER_MIN / treatmentLogData.treatmentDuration_sec;
+    treatmentLogData.targetUFRate_mL_min = ( ( treatmentLogData.targetUFVolume_L * ML_PER_LITER * SEC_PER_MIN ) / treatmentLogData.treatmentDuration_sec );
+    // Actual UF Volume/Rate
     if ( treatmentLogData.actualTreatmentDur_sec > 0 )
     {
         treatmentLogData.actualUFVolume_L = getUltrafiltrationVolumeCollected() / ML_PER_LITER;
@@ -248,6 +253,7 @@
     treatmentLogData.heparinDispenseRate_mL_hr = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE );
     treatmentLogData.heparinPreStop_min = getTreatmentParameterU32( TREATMENT_PARAM_HEPARIN_PRE_STOP_TIME );
     treatmentLogData.heparinDeliveredVolume_mL = getSyringePumpVolumeDelivered();
+    treatmentLogData.heparinType = getTreatmentParameterU32( TREATMENT_PARAM_HEPARIN_TYPE );
 
     treatmentLogData.avgArterialPressure_mmHg = getTreatmentAvgArterialPressure();
     treatmentLogData.avgVenousPressure_mmHg = getTreatmentAvgVenousPressure();