Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -rdd8d00b02a7565f3c5ce70040ae3b1bc40b4fe37 -r0caa659858cdbd6b887dda7417ffbbd3123f17f6
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision dd8d00b02a7565f3c5ce70040ae3b1bc40b4fe37)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 0caa659858cdbd6b887dda7417ffbbd3123f17f6)
@@ -82,7 +82,7 @@
 } ALARM_PRIORITY_RANKS_T;
 
 /// Enumeration of alarm audio self-test states.
-typedef enum Alarm_Lamp_Self_Test_States
+typedef enum Alarm_Audio_Self_Test_States
 {
     ALARM_AUDIO_SELF_TEST_STATE_START = 0,      ///< Start state of alarm audio self-test.
     ALARM_AUDIO_SELF_TEST_STATE_PRIMARY,        ///< Test tone state of alarm audio self-test.
Index: firmware/App/Services/FPGA.h
===================================================================
diff -u -rf760ffc4b10556e5186e9ceb90294262063440ca -r0caa659858cdbd6b887dda7417ffbbd3123f17f6
--- firmware/App/Services/FPGA.h	(.../FPGA.h)	(revision f760ffc4b10556e5186e9ceb90294262063440ca)
+++ firmware/App/Services/FPGA.h	(.../FPGA.h)	(revision 0caa659858cdbd6b887dda7417ffbbd3123f17f6)
@@ -59,8 +59,6 @@
 
 void setAlarmAudioState( U32 state, U32 volumeLevel, U32 volumeDivider );
 
-F32 getFPGABloodFlowSignalStrength( void );
-
 U16 getFPGABloodPumpHallSensorCount( void );
 U08 getFPGABloodPumpHallSensorStatus( void );
 U16 getFPGADialInPumpHallSensorCount( void );
@@ -112,8 +110,6 @@
 
 void getFPGAAirTrapLevels( BOOL *airAtLower, BOOL *airAtUpper );
 
-void setFPGASensorTest( U08 sensorTest );
-
 void setFPGAValvesControlMode( U16 bits );
 U16  getFPGAValvesStatus( void );
 
Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -rd611c5eeaee076a6fbf79cf94f80fff05fd5d9a9 -r0caa659858cdbd6b887dda7417ffbbd3123f17f6
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision d611c5eeaee076a6fbf79cf94f80fff05fd5d9a9)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 0caa659858cdbd6b887dda7417ffbbd3123f17f6)
@@ -29,6 +29,11 @@
 #include "TaskGeneral.h"
 #include "Timers.h"
 
+/**
+ *  @addtogroup Reservoirs
+ *  @{
+ */
+
 // ********** private definitions **********
 
 #define RESERVOIR_FRESH_SETTLE_TIME_MS                    15000                                          ///< Allocated time to settle the freshly filled reservoir in milliseconds.
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r85814f50ffa07b1794e9b1c40d3e558554a7fb77 -r0caa659858cdbd6b887dda7417ffbbd3123f17f6
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 85814f50ffa07b1794e9b1c40d3e558554a7fb77)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 0caa659858cdbd6b887dda7417ffbbd3123f17f6)
@@ -65,23 +65,27 @@
 #define ACK_NOT_REQUIRED                FALSE               ///< Macro for functions that want to know if an outgoing message requires acknowledgement from receiver.
 
 #pragma pack(push, 1)
+/// Payload record structure for ACK response.
 typedef struct
 {
     U08 acknowledgement;         ///< Acknowledgement Byte
 } ACK_RESPONSE_PAYLOAD_T;
 
+/// Payload record structure for off button response.
 typedef struct
 {
     U08 userRequest;            ///< request to confirm, cancel, or reject off button request
 } UI_OFF_BUTTON_RESPONSE_PAYLOAD_T;
 #pragma pack(pop)
 
+/// Payload record structure for UI response.
 typedef struct
 {
     BOOL accepted;              ///< Accepted/Rejected
     U32 rejectionReason;        ///< Rejection reason if not accepted.
 } UI_RESPONSE_PAYLOAD_T;
 
+/// Payload record structure for UF change response.
 typedef struct
 {
     BOOL accepted;              ///< Accepted/Rejected
@@ -94,6 +98,7 @@
     F32 oldUFRate;              ///< Previous UF Rate in mL/min.
 } UF_SETTINGS_CHANGE_RESPONSE_PAYLOAD_T;
 
+/// Payload record structure for UF change confirmation response.
 typedef struct
 {
     BOOL accepted;              ///< Accepted/Rejected
@@ -103,6 +108,7 @@
     F32 ufRate;                 ///< UF rate in mL.
 } UF_SETTINGS_CONFIRMATION_RESPONSE_PAYLOAD_T;
 
+/// Payload record structure for treatment duration change response.
 typedef struct
 {
     BOOL accepted;              ///< Accepted/Rejected
@@ -111,6 +117,7 @@
     F32 volume;                 ///< UF Volume in mL.
 } TREATMENT_TIME_CHANGE_RESPONSE_PAYLOAD_T;
 
+/// Payload record structure for blood / dialysate rate change response.
 typedef struct
 {
     BOOL accepted;              ///< Accepted/Rejected
@@ -119,6 +126,7 @@
     U32 dialRate;               ///< new dialysate flow rate
 } BLOOD_DIAL_RATE_CHANGE_RESPONSE_PAYLOAD_T;
 
+/// Payload record structure for event messages.
 typedef struct
 {
     U32 event;                  ///< Event ID
@@ -128,6 +136,7 @@
     EVENT_DATAS_T data2;        ///< Data field 2
 } EVENT_PAYLOAD_T;
 
+/// Payload record structure for treatment parameter broadcast messages.
 typedef struct
 {
     U32 minTreatmentTime;       ///< Minimum treatment duration (in minutes)
@@ -225,9 +234,6 @@
 // MSG_ID_DG_FLOW_SENSORS_DATA
 void handleDialysateFlowData( MESSAGE_T *message );
 
-// MSG_ID_DG_PRESSURES_DATA:
-void handleDGPressuresData( MESSAGE_T *message );
-
 // MSG_ID_DG_RESERVOIR_DATA:
 void handleDGReservoirData( MESSAGE_T *message );