diff --git a/py/doc/TODO.txt b/py/doc/TODO.txt
index 18f7c2e87..06e2f2b2d 100644
--- a/py/doc/TODO.txt
+++ b/py/doc/TODO.txt
@@ -102,18 +102,21 @@ testing
   use that check if all py and PyPy tests pass
   as good as they do without. 
 
-* make --box run on the trunk 
+* make --box run on the trunk. This requires having some sort of
+  is_boxed() function, while having it on config object seems
+  to be not that smart idea.
 
 * (DONE more or less) try to be as 2.2 compatible as possible 
   (use e.g. py.builtin.enumerate instead of "enumerate" directly) 
 
-* have all sessions check their options via Session.fixoptions()
-  and have session-particular tests and checks accordingly. 
+* (DONE for rsession) have all sessions check their options via
+  Session.fixoptions() and have session-particular tests and checks
+  accordingly. 
 
 distributed testing / RSession
 ------------------------------------
 
-* cleanup initialisation of config / get rid of pkgdir
+* (DONE, except apigen) cleanup initialisation of config / get rid of pkgdir
 * unify option names (dist_*) 
 * (optional) see if more of py/test/session.py's Session can be reused 
 * have dist_rsyncroots be relative to the conftest.py file