diff --git a/TODO b/TODO
index 45be03cd..ae37045e 100644
--- a/TODO
+++ b/TODO
@@ -28,19 +28,26 @@
    - [X] cleanup ascending/descending stuff
    - [X] testing
 
-** release 0.7 [%]
+** release 0.7 [28%]
 
-   - [ ] detect mail threads
+   - [ ] detect mail threads (?)
    - [ ] signal handler
+   - [X] fix max 10000 matches limit
+   - [X] embed database version in database
+   - [X] MuMsgXapian => MuMsgIterXapian
+   - [ ] don't store both values and terms
    - [ ] clean up mu-msg-field
+   - [X] fix the batch stuff
    - [ ] mu help <cmd>
    - [ ] mu view <path>
-   - [ ] add move-mail support
    - [ ] add symlink-following option for index
    - [ ] test suite
    - [ ] moving msg field formatting to MuMsgField (?)
+   - [ ] auto clean log file
+
+** release 0.8 [%]
    - [ ] bookmarks
    - [ ] mu-setup (?)
    - [ ] config system (config file) (?)
    - [ ] UTF-8 output to console
-   - [ ] auto clean log file
+   - [ ] search for date interval etc.