diff --git a/docs/source/todo.rst b/docs/source/todo.rst
index 067783ebd..76ccad171 100644
--- a/docs/source/todo.rst
+++ b/docs/source/todo.rst
@@ -1,22 +1,28 @@
 TODO
 ====
 
-For next release
-^^^^^^^^^^^^^^^^
+For next compiler release
+^^^^^^^^^^^^^^^^^^^^^^^^^
 - rename libdirs option to srcdirs?
 - can we derive module.name from module.source (taking just the filename base)?
 - can Position.file be a Path- making the source variable for nodes unnecessary?
+- address more questions/issues from the testability discussions.
 
 
+Blocked by Commander-x16 v39 release
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 - simplify cx16.joystick_get2() once this cx16 rom issue is resolved: https://github.com/commanderx16/x16-rom/issues/203
   (I hope this will still be included into the final v39 roms release for the cx16)
 
 
 Future
 ^^^^^^
-- get rid of all other TODO's in the code ;-)
-- see if we can remove more ".typeOrElse(DataType.UNDEFINED)"
-- should we introduce more optionals to get rid of more null pointers?
+- get rid of all TODO's and FIXME's in the code
+- improve testability further, add more tests
+- can we get rid of pieces of asmgen.AssignmentAsmGen by just reusing the AugmentableAssignment ? generated code should not suffer
+- see if we can remove more "[InferredType].getOr(DataType.UNDEFINED)"
+- use more of Result<> and Either<> to handle errors/ nulls better
+- fix the asm-labels problem (github issue #62)
 - c64: make the graphics.BITMAP_ADDRESS configurable (VIC banking)
 - optimize several inner loops in gfx2 even further?
 - add modes 2 and 3 to gfx2 (lowres 4 color and 16 color)?
@@ -34,9 +40,9 @@ Future
   see https://www.reddit.com/r/programming/comments/alhj59/creating_a_programming_language_and_cross/eg898b9?utm_source=share&utm_medium=web2x&context=3
 
 
-More code optimizations
-^^^^^^^^^^^^^^^^^^^^^^^
+More code optimization ideas
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 - a way to optimize if-statement codegen so that "if var & %10000" doesn't use stack & subroutine call, but also that the simple case "if X {...}" remains fast
-- detect proper variables that are written but never read - mark those as unused too and remove them, such as ``uword unused = memory("unused222", 20)`` - also remove this memory slab allocation
+- detect variables that are written but never read - mark those as unused too and remove them, such as ``uword unused = memory("unused222", 20)`` - also remove this memory slab allocation
 - rewrite expression tree evaluation such that it doesn't use an eval stack but flatten the tree into linear code that uses a fixed number of predetermined value 'variables'
 - this removes the need for the BinExprSplitter (which is problematic now)