Index: firmware/App/Modes/BloodPrime.c
===================================================================
diff -u -r931ca8779b64aa8bb68aa26d1f631d040a753007 -rb15f0a054b8b0a315476ea5ea95869be5da00a59
--- firmware/App/Modes/BloodPrime.c	(.../BloodPrime.c)	(revision 931ca8779b64aa8bb68aa26d1f631d040a753007)
+++ firmware/App/Modes/BloodPrime.c	(.../BloodPrime.c)	(revision b15f0a054b8b0a315476ea5ea95869be5da00a59)
@@ -167,7 +167,7 @@
  * @brief
  * The resetBloodPrimeFlags function resets the blood prime request flags.
  * @details Inputs: none
- * @details Outputs: Blood prime request flags reset.
+ * @details Outputs: airTrapFillInProgress
  * @return none
  *************************************************************************/
 static void resetBloodPrimeFlags( void )
@@ -226,8 +226,9 @@
  * @brief
  * The handleBloodPrimeRampState function handles the blood prime ramp
  * state operations.
- * @details Inputs: flags
- * @details Outputs: flags handled
+ * @details Inputs: bloodPrimeTargetVolume_mL, airTrapFillInProgress,
+ * bloodPrimeRampControlTimerCtr
+ * @details Outputs: cumulativeBloodPrimeVolume_mL, bloodPrimeRampControlTimerCtr
  * @return next blood prime state
  *************************************************************************/
 static BLOOD_PRIME_STATE_T handleBloodPrimeRampState( void )
Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r51fd08fdee3c5471fb0ff598fcae31306374c425 -rb15f0a054b8b0a315476ea5ea95869be5da00a59
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 51fd08fdee3c5471fb0ff598fcae31306374c425)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision b15f0a054b8b0a315476ea5ea95869be5da00a59)
@@ -206,7 +206,7 @@
  * may be stopped and resumed multiple times due to alarms or user intervention
  * and we don't want to start the treatment all over again.
  * @details Inputs: none
- * @details Outputs: none
+ * @details Outputs: airTrapFillInProgress, lastUFTimeStamp
  * @return none
  *************************************************************************/
 void transitionToDialysis( void )
@@ -577,7 +577,7 @@
  * @brief
  * The execDialysis function executes the Dialysis sub-mode state machine.
  * @details Inputs: currentDialysisState
- * @details Outputs: currentDialysisState
+ * @details Outputs: currentDialysisState, airTrapFillInProgress
  * @return none
  *************************************************************************/
 void execDialysis( void )
@@ -644,7 +644,7 @@
  * @brief
  * The handleDialysisUltrafiltrationState function handles the ultrafiltration
  * state of the Dialysis state machine.
- * @details Inputs: currentUFState
+ * @details Inputs: currentUFState, airTrapFillInProgress
  * @details Outputs: currentUFState
  * @return next Dialysis state.
  *************************************************************************/
@@ -747,7 +747,7 @@
  * @brief
  * The handleDialysisBloodLeakZeroingState function handles the blood leak
  * zeroing sub state of the state machine.
- * @details Inputs: none
+ * @details Inputs: airTrapFillInProgress
  * @details Outputs: none
  * @return next Dialysis state.
  *************************************************************************/
Index: firmware/App/Modes/Rinseback.c
===================================================================
diff -u -r48fda88cb7d8607181efb80f98deaaab1b343a92 -rb15f0a054b8b0a315476ea5ea95869be5da00a59
--- firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 48fda88cb7d8607181efb80f98deaaab1b343a92)
+++ firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision b15f0a054b8b0a315476ea5ea95869be5da00a59)
@@ -408,8 +408,13 @@
  * @brief
  * The handleRinsebackRunState function handles the rinseback run state
  * operations.
- * @details Inputs: flags
- * @details Outputs: cumulativeRinsebackVolume_mL, flags handled
+ * @details Inputs: endRinsebackRequested, pauseRinsebackRequested,
+ * airTrapFillInProgress, rinsebackRate_mL_min, incrRinsebackFlowRateRequested,
+ * decrRinsebackFlowRateRequested
+ * @details Outputs: cumulativeRinsebackVolume_mL, rinsebackTimerCtr,
+ * targetRinsebackVolumePlusAdditional_mL, rinsebackRate_mL_min,
+ * incrRinsebackFlowRateRequested, decrRinsebackFlowRateRequested,
+ * targetRinsebackVolumePlusAdditional_mL, rinsebackRate_mL_min
  * @return next rinseback state
  *************************************************************************/
 static RINSEBACK_STATE_T handleRinsebackRunState( void )
@@ -595,8 +600,10 @@
  * @brief
  * The handleRinsebackRunAdditionalState function handles the rinseback additional
  * state operations.
- * @details Inputs: flags
- * @details Outputs: flags handled
+ * @details Inputs: additionalRinsebackVolume_mL, rinsebackAdditionalTimerCtr
+ * @details Outputs: rinsebackTimerCtr, additionalRinsebackVolume_mL,
+ * totalAdditionalRinsebackVolume_mL, cumulativeRinsebackVolume_mL,
+ * rinsebackAdditionalTimerCtr
  * @return next rinseback state
  *************************************************************************/
 static RINSEBACK_STATE_T handleRinsebackRunAdditionalState( void )
Index: firmware/App/Modes/SalineBolus.c
===================================================================
diff -u -r0bb3fe3f34c02bd19c36aff2b98876e46a2ad177 -rb15f0a054b8b0a315476ea5ea95869be5da00a59
--- firmware/App/Modes/SalineBolus.c	(.../SalineBolus.c)	(revision 0bb3fe3f34c02bd19c36aff2b98876e46a2ad177)
+++ firmware/App/Modes/SalineBolus.c	(.../SalineBolus.c)	(revision b15f0a054b8b0a315476ea5ea95869be5da00a59)
@@ -63,7 +63,7 @@
  * @details Inputs: none
  * @details Outputs: currentSalineBolusState, salineBolusBroadcastTimerCtr,
  * totalSalineVolumeDelivered_mL, bolusSalineVolumeDelivered_mL,
- * salineBolusStartRequested, salineBolusAbortRequested
+ * salineBolusStartRequested, salineBolusAbortRequested, airTrapFillInProgress
  * @return none
  *************************************************************************/
 void initSalineBolus( void )
@@ -83,7 +83,7 @@
  * The resetSalineBolus function resets the saline bolus variables.
  * @details Inputs: currentSalineBolusState
  * @details Outputs: bolusSalineVolumeDelivered_mL, salineBolusStartRequested,
- * salineBolusAbortRequested, currentSalineBolusState
+ * salineBolusAbortRequested, currentSalineBolusState, airTrapFillInProgress
  * @return none
  *************************************************************************/
 void resetSalineBolus( void )
@@ -100,7 +100,7 @@
  * @brief
  * The execSalineBolus function executes the saline bolus state machine.
  * @details Inputs: currentSalineBolusState
- * @details Outputs: currentSalineBolusState
+ * @details Outputs: currentSalineBolusState, airTrapFillInProgress
  * @return Current saline bolus state machine.
  *************************************************************************/
 SALINE_BOLUS_STATE_T execSalineBolus( void )
@@ -381,8 +381,11 @@
  * @brief
  * The handleSalineBolusInProgressState function handles the in-progress state of the
  * saline bolus state machine.
- * @details Inputs: none
- * @details Outputs:
+ * @details Inputs: bolusSalineLastVolumeTimeStamp, bolusSalineVolumeDelivered_mL,
+ * totalSalineVolumeDelivered_mL, salineBolusAbortRequested
+ * @details Outputs: bolusSalineLastVolumeTimeStamp, bolusSalineVolumeDelivered_mL,
+ * totalSalineVolumeDelivered_mL, airTrapFillInProgress, salineBolusAbortRequested,
+ * salineBolusBroadcastTimerCtr
  * @return next saline bolus state
  *************************************************************************/
 static SALINE_BOLUS_STATE_T handleSalineBolusInProgressState( void )
Index: firmware/App/Modes/TreatmentEnd.c
===================================================================
diff -u -rbe52d03bb19fb71b2f90ae4c134204aefb93da4c -rb15f0a054b8b0a315476ea5ea95869be5da00a59
--- firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision be52d03bb19fb71b2f90ae4c134204aefb93da4c)
+++ firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision b15f0a054b8b0a315476ea5ea95869be5da00a59)
@@ -100,7 +100,8 @@
  * @brief
  * The resetTreatmentEndFlags function resets the treatment end request flags.
  * @details Inputs: none
- * @details Outputs: Treatment end request flags reset to FALSE.
+ * @details Outputs: txEndAlarmRinsebackRequested, txEndAlarmEndTreatmentRequested,
+ * txEndRinsebackRequested, airTrapFillInProgress
  * @return none
  *************************************************************************/
 static void resetTreatmentEndFlags( void )
@@ -148,9 +149,8 @@
  * @brief
  * The setupForTxEndWait4RinsebackState function sets actuators appropriately
  * for treatment end wait for rinseback state.
- * @details Inputs: none
- * @details Outputs: arterial and venous lines opened, blood pump started,
- * and air trap leveling control is started.
+ * @details Inputs: txEndTargetBloodFlowMLPM
+ * @details Outputs: bloodSittingTimerCtr
  * @return none
  *************************************************************************/
 static void setupForTxEndWait4RinsebackState( void )
@@ -236,7 +236,8 @@
  * The handleTxEndWait4RinsebackState function handles the treatment end
  * wait for rinseback state operations.
  * @details Inputs: txEndDrainCmdSent, txEndAlarmEndTreatmentRequested,
- * txEndRinsebackRequested, txEndAlarmRinsebackRequested, txEndTimerCtr
+ * txEndRinsebackRequested, txEndAlarmRinsebackRequested, txEndTimerCtr,
+ * airTrapFillInProgress, txEndTargetBloodFlowMLPM
  * @details Outputs: txEndDrainCmdSent
  * @return next treatment end wait for rinseback state
  *************************************************************************/
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rbe52d03bb19fb71b2f90ae4c134204aefb93da4c -rb15f0a054b8b0a315476ea5ea95869be5da00a59
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision be52d03bb19fb71b2f90ae4c134204aefb93da4c)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision b15f0a054b8b0a315476ea5ea95869be5da00a59)
@@ -66,6 +66,7 @@
 } BLOCKED_MSGS_DATA_T;
 #pragma pack(pop)
 
+/// Institutional record payload structure
 typedef struct
 {
     U32 minBloodFlowMLPM;                                   ///< Min blood flow in mL/min.
@@ -99,6 +100,7 @@
     U32 txEndBloodFlowMLPM;                                 ///< Treatment end blood flow in mL/min.
 } HD_INSTITUTIONAL_LOCAL_RECORD_T;
 
+/// Local serial number
 typedef struct
 {
     U08 topLevelSN[ MAX_TOP_LEVEL_SN_CHARS ];