Index: firmware/App/Monitors/Buttons.c
===================================================================
diff -u -rf99f8b365af2274d68d7f424cc9be9815b4db19c -re9f15ff59ac0350adcbe544df8b3451e15ee7287
--- firmware/App/Monitors/Buttons.c	(.../Buttons.c)	(revision f99f8b365af2274d68d7f424cc9be9815b4db19c)
+++ firmware/App/Monitors/Buttons.c	(.../Buttons.c)	(revision e9f15ff59ac0350adcbe544df8b3451e15ee7287)
@@ -286,7 +286,8 @@
  * @brief
  * The initiatePowerOff function initiates a power off sequence.
  * @details \b Inputs: none
- * @details \b Outputs: offRequestDelayTimer, offRequestPulseTimer, offRequestPulseCount, offButtonPressPending
+ * @details \b Outputs: offRequestDelayTimer, offRequestPulseTimer,
+ * offRequestPulseCount, offButtonPressPending
  * @return none
  *************************************************************************/
 void initiatePowerOff( void )
@@ -308,13 +309,14 @@
  * @details \b Message \b Sent: OFF_BUTTON_CMD_CANCEL_USER_CONFIRM_PROMPT when
  * pending off button expires.
  * @details \b Inputs: offButtonState, prevOffButtonState
- * @details \b Outputs: offButtonPressPending, offRequestPulseCount, offRequestPulseTimer
+ * @details \b Outputs: offButtonPressPending, offRequestPulseCount, offRequestPulseTimer
+ * offRequestAwaitingUserConfirmation, offRequestPendingTimer
  * @return none
  *************************************************************************/
 static void handleOffButtonProcessing( void )
 {
     static U08 shutdownFlag = FALSE;
-    CONFIRMATION_REQUEST_STATUS_T responceStatus = CONFIRMATION_REQUEST_STATUS_UNUSED;
+    CONFIRMATION_REQUEST_STATUS_T responseStatus = CONFIRMATION_REQUEST_STATUS_UNUSED;
 
     // Handle button state transitions for off button
     if ( getOffButtonState() != prevOffButtonState )
@@ -354,17 +356,17 @@
                                           CONFIRMATION_REQUEST_STATUS_TIMEOUT );
         }
 
-        responceStatus = getConfirmationRequestStatus( GENERIC_CONFIRM_ID_POWER_OFF );
+        responseStatus = getConfirmationRequestStatus( GENERIC_CONFIRM_ID_POWER_OFF );
 
-        if ( CONFIRMATION_REQUEST_STATUS_REJECTED == responceStatus )
+        if ( CONFIRMATION_REQUEST_STATUS_REJECTED == responseStatus )
         {
             offRequestAwaitingUserConfirmation = FALSE;
         }
-        else if ( CONFIRMATION_REQUEST_STATUS_TIMEOUT == responceStatus )
+        else if ( CONFIRMATION_REQUEST_STATUS_TIMEOUT == responseStatus )
         {
             offRequestAwaitingUserConfirmation = FALSE;
         }
-        else if ( CONFIRMATION_REQUEST_STATUS_ACCEPTED == responceStatus )
+        else if ( CONFIRMATION_REQUEST_STATUS_ACCEPTED == responseStatus )
         {
             offRequestAwaitingUserConfirmation = FALSE;
 
@@ -447,7 +449,7 @@
         if ( getStopButtonState() == BUTTON_STATE_PRESSED )
         {
             stopButtonPressPending = TRUE;
-            stopButtonPendingTimer = getMSTimerCount();
+//            stopButtonPendingTimer = getMSTimerCount();
             // Log stop button press
             SEND_EVENT_WITH_2_U32_DATA( TD_EVENT_BUTTON, BUTTON_STOP, BUTTON_STATE_PRESSED )
         }