diff --git a/TODO b/TODO
index fd0343ec..1f545fca 100644
--- a/TODO
+++ b/TODO
@@ -39,3 +39,15 @@
 * configurable evaluated (%sh{...}) strings ? use an option to define
   the interpreters, regex for finding used kak variables (ability to
   add direct python/perl/ruby/whatever evaluation).
+
+* tab support for indentation
+
+* %rec{...%opt{tchou}...%sh{echo kanaky}} ~= "...${kak_opt_tchou}...$(echo kanaky)..."
+
+* Optimize BufferModificationListener behaviour:
+  - Editor should modify in reverse order, as a modification at one point does not
+    impact the position of selections before it, so applying modification in reverse
+    order removes the needs to have selection updated on the fly, and permit deferred
+    update.
+  - Accumulate all the modifications and update the selections with the
+    whole knowledge -> try to remove this O(n2) behaviour.