diff --git a/femto.tal b/femto.tal
index f8c2087..f351ccb 100644
--- a/femto.tal
+++ b/femto.tal
@@ -701,9 +701,14 @@
     #00 .searching/active STZ
     ;redraw-all JSR2 ;return JMP2
 
+( TODO: i haven't decided how to solve the problem of )
+( overlapping matches yet. i don't really want to maintain )
+( a global list of all matches, which means that currently )
+( it can change in response to e.g. cursor position when )
+( matches overlap. )
+
 @move-to-next-match
     .buffer/limit LDZ2
-    ( FIXME: we should consider starting at the _end_ of the current match )
     ;cur-pos JSR2 INC2
     &loop
         GTH2k ,&next JCN ,&fail JMP
@@ -720,7 +725,6 @@
 
 @move-to-prev-match
     ;data
-    ( FIXME: we should consider starting at the _end_ of the current match )
     ;cur-pos JSR2 #0001 SUB2
     &loop
         GTH2k ,&fail JCN