diff --git a/TODO.txt b/TODO.txt
index 16a54abd151996f95d6c033a23838462adf1e8b7..98c6ae7779c78d07e63f69147cb7c5375976ff5e 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -23,6 +23,7 @@ Server
 
 - Add a backend plugin to configure network card settings. The IP address
   settings are stored in the server_ip table.
+-- This works now on Debian Squeeze (Lenny too I would guess) 2011-06-28
 
 
 Mail module
@@ -33,15 +34,8 @@ Mail module
   server/cron_daily.php
 - Show mail quota usage in the interface. This is started for Dovecot and
   requires testing
-
-
-DNS module
---------------------------------------
-
-- Add some kind of wizard to create DNS records easily. The idea is to have
-  some kind of template(s) to create all needed A and MX records defined in the
-  template with one click and the user has just to enter IP, domain, nameserver
-  and select the template that he wants to use.
+-- Functional on Debian Squeeze with newer Dovecot 2011-06-28
+-- Needs more cross platform support
 
 
 Administration module
@@ -50,7 +44,10 @@ Administration module
 - Add a firewall configuration form. Any suggestions for a good firewall
   script that runs on many Linux distributions, or shall we stay with Bastille
   firewall that is used in ISPConfig 2?
-
+-- There are a few options here. Some are already started. I (lathama) would
+   like to look at a pure IPTables (firewall_iptables) which can allow for 
+   other modules.
+-- Note: make sure to not interupt fail2ban
 
 Clients module
 --------------------------------------
@@ -62,6 +59,7 @@ Sites (web) module
 - Add a function to the Sites module to create SSL certificates or upload
   existing SSL certs and SSL chain files. It might be a good idea to add
   this as a new tab named "SSL" to the exiting domain settings form.
+-- This exists to some extent, review
 
 - Make sure that changes in the domain name do not break the configuration.
 
@@ -85,9 +83,11 @@ Interface
 - Enhance the list function to allow sorting by column
 - Enhance the paging in lists (e.g. like this: [1 2 3 4 ... 10])
 - Use graphical Icons in the lists for on / off columns.
-  CSS icons are also an option.
+  CSS icons are also an option. lathama 2011
+   http://nicolasgallagher.com/pure-css-gui-icons/
 - Add a graphical delete button to the lists.
-  CSS icons are also an option.
+  CSS icons are also an option. lathama 2011
+   http://nicolasgallagher.com/pure-css-gui-icons/
   
 
 General tasks
@@ -95,3 +95,7 @@ General tasks
 
 - Add, extend or modify comments in PEAR syntax so that they can be read with
   phpdocumentor.
+
+- Doxygen might be a good idea (phpdocumentor looks nice but no active development)
+-- http://drupal.org/node/1354 may have some good ideas.
+-- http://engineeredweb.com/blog/10/9/4-reasons-consider-doxygen-over-phpdocumentor