Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -r9353792f6dbd624a1d55cf1e87fa848e8fbaea71 -rf77b1d88f39e089be83734aaadfc952d17750d03
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 9353792f6dbd624a1d55cf1e87fa848e8fbaea71)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision f77b1d88f39e089be83734aaadfc952d17750d03)
@@ -54,15 +54,15 @@
 #define MAX_DIAL_OUT_FLOW_RATE                  700             ///< Maximum dialysate outlet pump flow rate in mL/min.
 #define MIN_DIAL_OUT_FLOW_RATE                  100             ///< Minimum dialysate outlet pump flow rate in mL/min.
 
-#define MAX_DIAL_OUT_PUMP_PWM_STEP_UP_CHANGE    0.0133F         ///< Maximum duty cycle change when ramping up ~ 200 mL/min/s.
-#define MAX_DIAL_OUT_PUMP_PWM_STEP_DN_CHANGE    0.02F           ///< Maximum duty cycle change when ramping down ~ 300 mL/min/s.
+#define MAX_DIAL_OUT_PUMP_PWM_STEP_UP_CHANGE    0.01064F        ///< Maximum duty cycle change when ramping up.
+#define MAX_DIAL_OUT_PUMP_PWM_STEP_DN_CHANGE    0.016F          ///< Maximum duty cycle change when ramping down.
 #define MAX_DIAL_OUT_PUMP_PWM_DUTY_CYCLE        0.90F           ///< Controller will error if PWM duty cycle > 90%, so set max to 89%.
 #define MIN_DIAL_OUT_PUMP_PWM_DUTY_CYCLE        0.10F           ///< Controller will error if PWM duty cycle < 10%, so set min to 10%.
 #define MAX_DIAL_OUT_PUMP_PWM_OFFSET_CONTROL    0.4F            ///< Maximum PWM offset (added to DPi PWM duty cycle).
 #define MIN_DIAL_OUT_PUMP_PWM_OFFSET_CONTROL   -0.4F            ///< Minimum PWM offset (added to DPi PWM duty cycle).
 
-#define P_VOL                                   0.001F          ///< P term for volume error feedback into dialysate outlet pump control.
-#define P_UF                                    0.001F          ///< P term for UF rate error feedback into dialysate outlet pump control.
+#define P_VOL                                   0.0008F         ///< P term for volume error feedback into dialysate outlet pump control.
+#define P_UF                                    0.0008F         ///< P term for UF rate error feedback into dialysate outlet pump control.
 #define P_CORR                                  0.0666F         ///< P term for volume error feedback into dialysate outlet pump flow estimate correction offset.
 
 #define RPM_2_ML_MIN_CONVERSION                 0.215964F       ///< Conversion factor for estimating flow rate from pump motor RPM.
@@ -99,26 +99,26 @@
 #define DOP_ADC_ZERO                            1998            ///< Mid-point (zero) for ADC readings.
 #define SIGN_FROM_12_BIT_VALUE(v)               ( (S16)(v) - (S16)DOP_ADC_ZERO )   ///< Macro converts a 12-bit ADC reading to a signed 16-bit value.
 
-#define DOP_SPEED_ADC_TO_RPM_FACTOR             1.751752        ///< Conversion factor from ADC counts to RPM for dialysate outlet pump motor (3500 RPM/1998 counts).
-#define DOP_MOTOR_RPM_TO_PWM_DC_FACTOR          0.000238F       ///< ~42 BP motor RPM = 1% PWM duty cycle
+#define DOP_SPEED_ADC_TO_RPM_FACTOR             2.152152F       ///< Conversion factor from ADC counts to RPM for dialysate outlet pump motor (4300 RPM/1998 counts).
+#define DOP_MOTOR_RPM_TO_PWM_DC_FACTOR          0.0002F         ///< ~50 BP motor RPM = 1% PWM duty cycle
 #define DOP_CURRENT_ADC_TO_MA_FACTOR            3.002F          ///< Conversion factor from ADC counts to mA for dialysate outlet pump motor.
 
 #define DOP_REV_PER_LITER                       146.84F         ///< Rotor revolutions per liter.
 #define DOP_ML_PER_MIN_TO_PUMP_RPM_FACTOR       ( DOP_REV_PER_LITER / ML_PER_LITER )   ///< Conversion factor from mL/min to pump motor RPM.
 #define DOP_GEAR_RATIO                          32.0F           ///< Pump motor to pump gear ratio.
 #define DOP_PWM_ZERO_OFFSET                     0.1F            ///< 10% PWM duty cycle = zero speed.
-#define DOP_100_PCT_PWM_RPM_RANGE               4000.0F         ///< 10-90% PWM range yields 0-3,200 RPM range.  Full 100% PWM range would yield 4,000 RPM range.
+#define DOP_100_PCT_PWM_RPM_RANGE               5000.0F         ///< 10-90% PWM range yields 0-4,000 RPM range.  Full 100% PWM range would yield 5,000 RPM range.
 #define DOP_RATE_CORRECTION_SCALAR              0.194F          ///< Scalar for estimating DPo rate correction offset based on target Qd.
 #define DOP_RATE_CORRECTION_OFFSET             -19.40F          ///< Offset for estimating DPo rate correction offset based on target Qd.
 
 /// Macro converts a flow rate to an estimated PWM duty cycle %.
-#define DOP_PWM_FROM_ML_PER_MIN(rate)           ( ( ( rate ) * 0.0009F ) + 0.0972F + DOP_PWM_ZERO_OFFSET )
+#define DOP_PWM_FROM_ML_PER_MIN(rate)           ( ( ( rate ) * 0.00072F ) + 0.0972F + DOP_PWM_ZERO_OFFSET )
 /// Conversion from PWM duty cycle % to commanded pump motor speed.
 #define DOP_PWM_TO_MOTOR_SPEED_RPM(pwm,dir)     ( ( ( ( pwm ) - DOP_PWM_ZERO_OFFSET) * DOP_100_PCT_PWM_RPM_RANGE ) * ( dir == MOTOR_DIR_FORWARD ? 1.0F : -1.0F ) )
 /// Conversion from RPM to PWM duty cycle %.
 #define DOP_MOTOR_SPEED_RPM_TO_PWM(rpm)         ( ( (F32)(rpm) / DOP_100_PCT_PWM_RPM_RANGE ) + DOP_PWM_ZERO_OFFSET )
 /// Macro converts a PWM to an estimated flow rate.
-#define DOP_ML_PER_MIN_FROM_PWM(pwm)            ( ( ( pwm - DOP_PWM_ZERO_OFFSET ) - 0.0972F ) / 0.0009F  )
+#define DOP_ML_PER_MIN_FROM_PWM(pwm)            ( ( ( pwm - DOP_PWM_ZERO_OFFSET ) - 0.0972F ) / 0.00072F  )
 /// Macro converts a PWM to an estimated flow rate (basic version).
 #define DOP_ML_PER_MIN_FROM_PWM_BASIC(pwm)      ( ( ( ( pwm ) - DOP_PWM_ZERO_OFFSET ) * DOP_100_PCT_PWM_RPM_RANGE ) * 0.2 )