diff --git a/TODO b/TODO
index e9058a9b..048f7381 100644
--- a/TODO
+++ b/TODO
@@ -20,11 +20,18 @@ See Feature Request Tracking System at SourceForge.net
 - add a check to see if the time of the log messages is
   correctly detected (valid regexp)
 
-- use Gentoo Portage style for scripts
+- use Gentoo Portage style for scripts.
+  - banning engines script in /etc/fail2ban/scripts.d
+    Example: /etc/fail2ban/scripts.d/iptables
+    Will be mostly bash scripting which is more "user
+    friendly".
   - split configuration files in /etc/fail2ban/services.d
+    for log files
     Example: /etc/fail2ban/services.d/apache
-  - template for common services in /etc/fail2ban/scripts.d
-    Example: /etc/fail2ban/scripts.d/apache
+    Mainly regular expressions.
+  - template for common regex in /etc/fail2ban/templates.d
+    Example: /etc/fail2ban/templates.d/date
+    Mainly regular expressions.
 
 - remove debug mode (root check)
 
@@ -32,7 +39,8 @@ See Feature Request Tracking System at SourceForge.net
 
 - use more email.Utils in mail.py
 
-- add gettext support
+- add gettext support. Is this really needed for a server
+  utility?
 
 - send an email when fail2ban is running
 
@@ -78,5 +86,8 @@ See Feature Request Tracking System at SourceForge.net
   Should we start one thread per file or just one thread per
   serivce?
 
-- optionally read failure patterns from file. If one regex
-  matches, consider it as a breaking in attempt.
+- autodetect date format in log file. Match the most popular
+  format and sort them using the hit ratio. Should avoid
+  user problem with regex and not have a big impact on perfs.
+
+- restart automatically the daemon if an exception occurs.