Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r1bea59c13158a871b80e76d75a2a1a579ae67434 -r895ae090a3c78f9e002ac526332ef29929ceef71
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 1bea59c13158a871b80e76d75a2a1a579ae67434)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 895ae090a3c78f9e002ac526332ef29929ceef71)
@@ -56,11 +56,13 @@
 #define ADJ_DELTA_TEMP_STEP                                        2.0F                                                            ///< Adjust target temperature based on D28 feedback per cycle.
 #define MAX_ADJ_DELTA_TEMP_C                                       7.0F                                                            ///< Maximum adjusted delta temperature to add/remove from calculated target temperature
 #define D5_HEAT_TX_INIT_FEED_FORWARD                               0.0F                                                            ///< Initial Feed forward term for heater control
-#define D5_HEAT_TX_P_COEFFICIENT                                   0.017F                                                          ///< P Term for AC primary heater control during treatment mode.
-#define D5_HEAT_TX_I_COEFFICIENT                                   0.002F                                                          ///< I Term for AC primary heater control during treatment mode.
+#define D5_HEAT_TX_P_COEFFICIENT                                   0.05F                                                           ///< P Term for AC primary heater control during treatment mode.
+#define D5_HEAT_TX_I_COEFFICIENT                                   0.001F                                                          ///< I Term for AC primary heater control during treatment mode.
 
-#define D45_HEAT_P_COEFFICIENT                                     0.20F                                                           ///< P Term for trimmer heater control.
-#define D45_HEAT_I_COEFFICIENT                                     0.05F                                                           ///< I Term for trimmer heater control.
+//#define D45_HEAT_P_COEFFICIENT                                     0.20F                                                           ///< P Term for trimmer heater control.
+//#define D45_HEAT_I_COEFFICIENT                                     0.05F                                                           ///< I Term for trimmer heater control.
+#define D45_HEAT_P_COEFFICIENT                                     0.05F                                                           ///< P Term for trimmer heater control.
+#define D45_HEAT_I_COEFFICIENT                                     0.02F                                                           ///< I Term for trimmer heater control.
 #define D45_HEAT_TX_INIT_FEED_FORWARD                              0.0F                                                            ///< Initial Feed forward term for heater control
 
 #define HEATERS_DATA_PUBLISH_INTERVAL                              ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )                      ///< Heaters data publish interval.
Index: firmware/App/Monitors/Temperature.c
===================================================================
diff -u -r1bea59c13158a871b80e76d75a2a1a579ae67434 -r895ae090a3c78f9e002ac526332ef29929ceef71
--- firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision 1bea59c13158a871b80e76d75a2a1a579ae67434)
+++ firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision 895ae090a3c78f9e002ac526332ef29929ceef71)
@@ -418,7 +418,7 @@
  * @brief
  * The getD4AverageTemperature function returns the average temperature
  * for D4 temp sensor.
- * @details \b Inputs: none
+ * @details \b Inputs: filteredcurrentTemperatureReadings
  * @details \b Outputs: none
  * @return the D4 average temperature
  *************************************************************************/
@@ -433,7 +433,7 @@
  * @brief
  * The getD50AverageTemperature function returns the average temperature
  * for D50 temp sensor.
- * @details \b Inputs: none
+ * @details \b Inputs: filteredcurrentTemperatureReadings
  * @details \b Outputs: none
  * @return the D50 average temperature
  *************************************************************************/
@@ -448,7 +448,7 @@
  * @brief
  * The getD99AverageTemperature function returns the average temperature
  * for D99 temperature sensor.
- * @details \b Inputs: none
+ * @details \b Inputs: filteredcurrentTemperatureReadings
  * @details \b Outputs: none
  * @return the D99 average temperature
  *************************************************************************/
@@ -463,7 +463,7 @@
  * @brief
  * The getD78AverageTemperature function returns the average temperature
  * for D78 temperature sensor.
- * @details \b Inputs: none
+ * @details \b Inputs: filteredcurrentTemperatureReadings
  * @details \b Outputs: none
  * @return the D78 average temperature
  *************************************************************************/