diff --git a/TODO b/TODO
index 5372b7ef7d236cb861b2a9f3c7f97646faeb112f..512ec447f813426f06a7ca924574cde6b48c2fe6 100644
--- a/TODO
+++ b/TODO
@@ -15,11 +15,13 @@ Current:
 	- Add owner-email to the Auto-submitted field
 	- Implement checking the :from argument for validity and policy 
 	  violations.
+* Implement means to configure which extensions to provide and incorporate
+  enotify extension into default compile.  
 
 Next (in order of descending priority/precedence):
 
 * Fix remaining RFC deviations:
-	- Fix issues listed in doc/rfc/RFC-questions.txt when answers arrive
+	- Fix issues listed in doc/rfc/RFC-questions.txt based on answers
 	- Allow for the existance of dynamic comparators (i.e. specified by 
 	  variables). 
 	- Allow for dynamic includes (i.e. specified by variables).
@@ -43,9 +45,12 @@ Next (in order of descending priority/precedence):
 * Implement dropping errors in the user's mailbox as a mail message.
 * Add normalize() method to comparators to normalize the string before matching
   (for efficiency).
-* Make this implementation conform section 2.7.2 of RFC3028 (Comparisons Across
-  Character Sets). 
-* Implement comparator-i;unicode-casemap
+* Properly implement Sieve internationalization support (utf-8 handling), currently
+  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.
+	- Implement comparator-i;unicode-casemap.
 * Implement environment extension
 * Make testsuite much more exhaustive and add support for testing the actual
   result.