diff --git a/TODO b/TODO
index 7801c545aa..bc5cbb6740 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-NuttX TODO List (Last updated January 23, 2018)
+NuttX TODO List (Last updated March 4, 2018)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 This file summarizes known NuttX bugs, limitations, inconsistencies with
@@ -9,7 +9,7 @@ issues related to each board port.
 
 nuttx/:
 
- (14)  Task/Scheduler (sched/)
+ (15)  Task/Scheduler (sched/)
   (1)  SMP
   (1)  Memory Management (mm/)
   (0)  Power Management (drivers/pm)
@@ -21,13 +21,13 @@ nuttx/:
   (6)  Binary loaders (binfmt/)
  (16)  Network (net/, drivers/net)
   (4)  USB (drivers/usbdev, drivers/usbhost)
-  (0)  Other drivers (drivers/)
+  (2)  Other drivers (drivers/)
  (12)  Libraries (libc/, libm/)
  (10)  File system/Generic drivers (fs/, drivers/)
  (10)  Graphics Subsystem (graphics/)
   (1)  Build system / Toolchains
   (3)  Linux/Cywgin simulation (arch/sim)
-  (4)  ARM (arch/arm/)
+  (5)  ARM (arch/arm/)
 
 apps/ and other Add-Ons:
 
@@ -388,6 +388,18 @@ o Task/Scheduler (sched/)
   Priority:    Low.  This is an enhancement.  And does anyone actually use
                the sporadic scheduler?
 
+  Title:       REMOVE NESTED CANCELATION POINT SUPPORT
+  Description: The current implementation support nested cancelation points.
+               The TCB field cpcount keeps track of that nesting level.
+               However, cancelation points should not be calling other
+               cancellation points so this design could be simplified by
+               removing all support for nested cancellation points.
+  Status:      Open
+  Priority:    Low.  No harm is being done by the current implementation.
+               This change is primarily for aesthetic reasons.  If would
+               reduce memory usage by a very small but probably
+               insignificant amount.
+
 o SMP
   ^^^
 
@@ -2109,6 +2121,30 @@ o Build system
 o Other drivers (drivers/)
   ^^^^^^^^^^^^^^^^^^^^^^^^
 
+  Title:       SYSLOG OUTPUT LOST ON A CRASH
+  Desription:  Flush syslog output on crash.  I don't know how to do in the
+               character driver case with interrupts disabled.  It would be
+               easy to flush the interrupt interrupt buffer, but not the
+               data buffered within a character driver (such as the serial
+               driver).
+
+               Perhaps there could be a crash dump IOCTL command to flush
+               that buffered data with interrupts disabled?
+  Status:      Open
+  Priority:    Low.  It would be a convenience and would simplify crash
+               debug if you could see all of the SYSLOG output up to the
+               time of the crash.  But not essential.
+
+  Title:       ADD SUPPORT FOR CONTROL-C
+  Description: Add support for control-C interrupts and perhaps other
+               interrupts generated from a keyboard.  See this thread for
+               additional thoughts:
+               https://groups.yahoo.com/neo/groups/nuttx/conversations/messages/15761
+  Status:      Open
+  Priority:    Low.  This would make working with tasks at the NSH terminal
+               more like working with processes via a Bash shell.  That is
+               a feature enhancement.
+
 o Linux/Cywgin simulation (arch/sim)
   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -2288,6 +2324,19 @@ o ARM (arch/arm/)
   Status:      Open
   Priority:    Low-ish, but a good opportunity for performance improvement.
 
+  Title:       USE COMMON VECTOR LOGIC IN ALL ARM ARCHITECTURES.
+  Description: Originally, each ARMv7-M MCU architecture had its own
+               private implementation for interrupt vectors and interrupt
+               handling logic.  This was superceded by common interrupt
+               vector logic but these private implementations were never
+               removed from older MCU architectures.  This is turning into
+               a maintenance issue because any improvements to the common
+               vector handling must also be re-implemented for each of the
+               older MCU architectures.
+  Status:      Open
+  Priority:    Low.  A pain in the ass and an annoying implementation, but
+               not really an issue otherwise.
+
 o Network Utilities (apps/netutils/)
   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^