diff --git a/TODO b/TODO
index f9ca65dda7e5aa94527b59eeca04fe29525172f5..65114c92e45c120607a753ac255c69eb54347568 100644
--- a/TODO
+++ b/TODO
@@ -1,10 +1,11 @@
 Current:
 
 * Implement enotify extension:
-	- Implement parsing :options argument
+	- Implement parsing :options argument (not used for now however)
 	- Check whether handling of error conditions matches the standard
 	- Limit the number of notifications generated (on a per-method basis)
 * Implement mailto method for the enotify extension:
+	- Finish URI validation to properly recognize invalid characters.
 	- Check that URI headers are not duplicated if not allowed.
 * Incorporate enotify extension into default compile.  
 
@@ -39,7 +40,7 @@ Next (in order of descending priority/precedence):
   it is not complete:
 	- Make this implementation conform section 2.7.2 of RFC5228 (Comparisons 
 	  Across Character Sets). 
-	- Verify validity of utf-8 where necessary.
+	- Verify validity of utf8 where necessary.
 	- Implement comparator-i;unicode-casemap.
 * Implement environment extension
 * Make testsuite much more exhaustive and add support for testing the actual