diff --git a/TODO b/TODO
index e2a8aad25cf35cefe24727046c6401cec9999a9a..b97cf374483c233dbf425d6845afbad4cc9919d7 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,10 @@
 Current activities:
 
+* Improve debugging support in the sieve-test tool:
+	- Improve trace debugging towards something more intuitively readable.
+	- Give trace debugging multiple levels of verbosity (e.g. to include more 
+    messy output like value matching).
+
 Next (in order of descending priority/precedence):
 
 * ## MAKE A SECOND RELEASE (0.2.x) ##
@@ -25,18 +30,9 @@ Next (in order of descending priority/precedence):
 	  administrator on using sievec to precompile the scripts.
 	- Avoid reporting user-caused errors to the master log.
 	- Implement dropping errors in the user's mailbox as a mail message.
-* Improve debugging support in the sieve-test tool:
-	- Improve trace debugging towards something more intuitively readable.
-	- Give trace debugging multiple levels of verbosity (e.g. to include more 
-    messy output like value matching).
-* Implement a better way to encode source line numbers into a binary for
-  reporting errors at runtime. Currently, this is done explicitly for each 
-  command that adds actions to the result. However, some tests, match types etc. 
-  will also need this when the variables extension is active. Many of the RFC 
-  deviations listed below depend on this. Also trace debugging will benefit.
 * Fix remaining RFC deviations:
 	- Fix issues listed in doc/rfc/RFC-questions.txt based on answers
-	- Allow for the existance of dynamic comparators (i.e. specified by 
+	- Allow for the existence of dynamic comparators (i.e. specified by 
 	  variables). 
 	- Allow for :regex matching with variable key.
 	- Detect assignment of too large constant values to variables at compile