Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r5ff39fd6948ae3656b4035c85325bd8fca0a37f3 -r65cca9d3650f1da299e0c0c682bc557439a407f2
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 5ff39fd6948ae3656b4035c85325bd8fca0a37f3)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 65cca9d3650f1da299e0c0c682bc557439a407f2)
@@ -56,7 +56,6 @@
  * @details
  * Inputs : none
  * Outputs : Reservoirs module initialized.
- * @param none
  * @return none
  *************************************************************************/
 void initReservoirs( void )
@@ -66,6 +65,14 @@
     drainVolumeTargetMl.data = DEFAULT_DRAIN_VOLUME_ML;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The execReservoirs function manages periodic tasks for the Reservoirs module.
+ * @details
+ * Inputs : none
+ * Outputs : Reservoir data broadcast on interval.
+ * @return none
+ *************************************************************************/
 void execReservoirs( void )
 {
     // TODO - publish active reservoir, fill/drain volume targets at 1 Hz.
@@ -79,6 +86,16 @@
     }
 }
 
+/*********************************************************************//**
+ * @brief
+ * The setActiveReservoir function sets the given reservoir as active \n
+ * (meaning HD will be drawing from this reservoir).
+ * @details
+ * Inputs : none
+ * Outputs : Specified reservoir is set as active.
+ * @param resID : ID of reservoir to set as active.
+ * @return TRUE if set active reservoir command successful, FALSE if not.
+ *************************************************************************/
 BOOL setActiveReservoir( RESERVOIR_ID_T resID )
 {
     BOOL result = FALSE;
@@ -139,6 +156,7 @@
     // stop fill command only valid in fill mode
     if ( MODE_FILL == getCurrentOperationMode() )
     {
+        fillVolumeTargetMl.data = 0;
         requestNewOperationMode( MODE_CIRC );
     }
 
@@ -187,6 +205,7 @@
     // stop drain command only valid in drain mode
     if ( MODE_DRAI == getCurrentOperationMode() )
     {
+        drainVolumeTargetMl.data = 0;
         requestNewOperationMode( MODE_CIRC );
     }