Index: NVDataMgmt.c
===================================================================
diff -u -r0164cd187647ce322bb19f5075387732af38d09a -r2f7217131cfe6d5c53a7df934a6f202b00177811
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 0164cd187647ce322bb19f5075387732af38d09a)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 2f7217131cfe6d5c53a7df934a6f202b00177811)
@@ -1170,7 +1170,7 @@
             break;
 
         default:
-            // TODO software fault
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_NV_RECORD_SELECTED, nvData );
             break;
 #endif
     }
@@ -1689,7 +1689,7 @@
                 }
             }
         }
-        // TODO add the log queue later in Phase 1B.
+        // Add the log queue later in Phase 1B.
     }
 
     // Check if a queue job is available
@@ -1725,7 +1725,7 @@
         else if ( ( NVDATAMGMT_READ == ops ) && ( NVDATAMGMT_RTC == location ) )
         {
             readFromRAM( startAddress, maxBufferLength );
-            //currentJob.externalAddress->status = NVDATAMGMT_READ_IN_PROGRESS; // TODO Phase 1B for logging
+            //currentJob.externalAddress->status = NVDATAMGMT_READ_IN_PROGRESS; // Phase 1B for logging
 
             currentTime = getMSTimerCount();
             state       = NVDATAMGMT_EXEC_STATE_READ_FROM_RTC;
@@ -1795,7 +1795,6 @@
     // If timed out, get back to Idle
     else if ( timeoutStatus == TRUE )
     {
-        // TODO schedule another write?
         recordAddressOffset = 0;
         state = NVDATAMGMT_EXEC_STATE_IDLE;
     }
@@ -1974,7 +1973,6 @@
    // If timed out, get back to Idle
    else if ( timeoutStatus == TRUE )
    {
-       // TODO schedule another write?
        recordAddressOffset = 0;
        state = NVDATAMGMT_EXEC_STATE_IDLE;
    }