diff --git a/CHANGELOG b/CHANGELOG
index 762504b5..d4c8de35 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,9 +4,14 @@
              |_| \__,_|_|_/___|_.__/\__,_|_||_|
 
 =============================================================
-Fail2Ban (version 0.7.1)                           2006/08/23
+Fail2Ban (version 0.7.2)                           2006/??/??
 =============================================================
 
+ver. 0.7.2 (2006/??/??) - ???
+----------
+- Refactoring and code cleanup
+- Improved client output
+
 ver. 0.7.1 (2006/08/23) - alpha
 ----------
 - Fixed daemon mode bug
diff --git a/TODO b/TODO
index 8add3074..4191a063 100644
--- a/TODO
+++ b/TODO
@@ -13,11 +13,13 @@ Legend:
 # partially done
 * done
 
+# implement all get/set functions
+
 - correct handling of threads (join???)
 
 - signal handling (ctrl-c, etc)
 
-- add a reload option to fail2ban-client
+* add a reload option to fail2ban-client
 
 - see Feature Request Tracking System at SourceForge.net
 
@@ -38,19 +40,6 @@ Legend:
 - add a check to see if the time of the log messages is
   correctly detected (valid regexp)
 
-? 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
-    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)
 
 # better return values in function
@@ -108,7 +97,7 @@ Legend:
   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.
+? restart automatically the daemon if an exception occurs.
 
 - do not close socket after a send