diff --git a/readme.txt b/readme.txt
index d08720d0d..fe9dd600d 100644
--- a/readme.txt
+++ b/readme.txt
@@ -90,6 +90,8 @@ Win32-MinGW            - ChibiOS/RT simulator and demo into a WIN32 process,
 - NEW: Added a debug option CH_DBG_ENABLE_STACK_CHECK for stack overflow
   checking. The check is not performed in the kernel but in the port code.
   Currently no ports implement it.
+- NEW: Unified makefiles for ARM7 and ARMCM3 projects, the new makefiles
+  share a common part making them easier to maintain.
 - CHANGE: Changed the chSemFastWaitS() macro in chSemFastWaitI() and
   chSemGetCounter() in chSemGetCounterI().
 - Improvements to the test suite, added a new level of indirection that allows
diff --git a/src/chmempools.c b/src/chmempools.c
index f052bb1e2..3fc4d0352 100644
--- a/src/chmempools.c
+++ b/src/chmempools.c
@@ -37,7 +37,7 @@
 void chPoolInit(MemoryPool *mp, size_t size) {
 
   chDbgAssert((mp != NULL) && (size >= sizeof(void *)),
-              "chpools.c, chPoolFree()");
+              "chpools.c, chPoolInit()");
 
   mp->mp_next = NULL;
   mp->mp_object_size = size;
diff --git a/todo.txt b/todo.txt
index c8f992bf5..8da1453bf 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,5 +1,11 @@
+Status:
+? = Not sure if worth the effort or useful at all.
+- = Planned.
+X = In progress, some work done.
+* = Done.
+
 After 1.0.0:
-X Improve makefiles by adding an options head section and making it shared.
+* Improved makefiles with settings section and shared common part.
 * Queues macros should not refer to the semaphore counters directly.
 * Priority ordering option for semaphores.
 * chSysLock() and chSysUnlock() with counter (option).
@@ -7,6 +13,8 @@ X Improve makefiles by adding an options head section and making it shared.
   implemented this as the new Suspended and Disabled states in 1.1.
 * Mailboxes subsystem (lwIP requires them).
 * Multiple debug switches.
+  - Split asserts from parameters checks.
+  - Add checks to all APIs.
   X Stack checks option.
   * Threads profiling option.
 * Idle loop hook macro.
@@ -19,8 +27,8 @@ After 1.2.0:
     or just be an alternative.
 - Minimal optional C-runtime library (complete enough for lwIP).
 - OSEK-style simple tasks within the idle thread.
-- Think to something for threads restart.
-- Multiple heaps, disjoint heaps, heaps in heaps.
+? Think to something for threads restart.
+? Multiple heaps, disjoint heaps, heaps in heaps.
 - Abstract I/O channels rather than just serial ports.
   - Move the serial drivers implementations in library al keep the I/O channel
     interface as part of the kernel. Better keep the core as compact as
@@ -41,18 +49,14 @@ X ChibiOS Wizard, UML modeling and ChibiOS applications code and
 X OSEK layer.
 - Posix layer.
 X File System
-- Visual debugger interfaced to OpenOCD.
-  - Objects registry.
+- Visual debugger/monitor interfaced through OpenOCD.
+  - Objects registry in the kernel.
 
 Lower priority:
 - More demos
 - More ARM ports
-- PIC24 port
+? PIC24 port
 - Microblaze port
 - PowerPC port
-- Coldfire port
-- H8 port
-
-- - Planned.
-X - In progress
-* - Done
+? Coldfire port
+? H8 port