diff --git a/ChangeLog b/ChangeLog
index 678f59fa..774d015c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jan 16 11:12:13 2006  Søren Sandmann  <sandmann@redhat.com>
+
+	* TODO: Updates
+
 Sun Jan 15 20:22:20 2006  Soeren Sandmann  <sandmann@redhat.com>
 
 	* module/sysprof-module.c (init_module): Print out sysprof version
diff --git a/TODO b/TODO
index 1f9afb39..fff6bd46 100644
--- a/TODO
+++ b/TODO
@@ -20,10 +20,16 @@ Before 1.0.2:
 
 Before 1.2:
 
-* Consider deleting cmdline hack in process.c and replace with something at 
-  the symbol resolution level.
+* Fix (deleted) problem. But more generally, whenever we can't display a
+  symbol, display an error message instead, ie., 
+	- 'Binary file <xxxx> was deleted/replaced'
+	- 'No mapping for address'
+	- 'No symbols in binary file'
+	- 'Address has no corrresponding symbol in file'
+	- etc.
 
-* Fix (deleted) problem.
+* Consider deleting cmdline hack in process.c and replace with something at 
+  the symbol resolution level. Will require more memory though.
 
 * Add spew infrastructure to make remote debugging easier.