diff --git a/TODO b/TODO
index e6c9234a..23a34875 100644
--- a/TODO
+++ b/TODO
@@ -13,6 +13,8 @@ Legend:
 # partially done
 * done
 
+- Better handling of the protocol in transmitter.py
+
 - Add gettext support (I18N)
 
 - Fix the cPickle issue with Python 2.5
diff --git a/common/protocol.py b/common/protocol.py
index ae1055ba..0a5910be 100644
--- a/common/protocol.py
+++ b/common/protocol.py
@@ -36,9 +36,9 @@ protocol = [
 ["status", "gets the current status of the server"], 
 ["ping", "tests if the server is alive"], 
 ['', ''], 
-["set loglevel <LEVEL>", "sets logging level to <LEVEL>"], 
+["set loglevel <LEVEL>", "sets logging level to <LEVEL>. 0 is minimal, 4 is debug"], 
 ["get loglevel", "gets the logging level"], 
-["set logtarget <TARGET>", "sets logging target to <TARGET>"], 
+["set logtarget <TARGET>", "sets logging target to <TARGET>. Can be STDOUT, STDERR, SYSLOG or a file"], 
 ["get logtarget", "gets logging target"], 
 ['', ''], 
 ["add <JAIL> <BACKEND>", "creates <JAIL> using <BACKEND>"], 
@@ -48,44 +48,44 @@ protocol = [
 ["set <JAIL> delignoreip <IP>", "removes <IP> from the ignore list of <JAIL>"], 
 ["set <JAIL> addlogpath <FILE>", "adds <FILE> to the monitoring list of <JAIL>"], 
 ["set <JAIL> dellogpath <FILE>", "removes <FILE> to the monitoring list of <JAIL>"], 
-["set <JAIL> timeregex <REGEX>", "sets the regular expression <REGEX> to match the date format for <JAIL>"], 
-["set <JAIL> timepattern <PATTERN>", "sets the pattern <PATTERN> to match the date format for <JAIL>"], 
+["set <JAIL> timeregex <REGEX>", "sets the regular expression <REGEX> to match the date format for <JAIL>. This will disable the autodetection feature."], 
+["set <JAIL> timepattern <PATTERN>", "sets the pattern <PATTERN> to match the date format for <JAIL>. This will disable the autodetection feature."], 
 ["set <JAIL> failregex <REGEX>", "sets the regular expression <REGEX> which must match failures for <JAIL>"], 
 ["set <JAIL> ignoreregex <REGEX>", "sets the regular expression <REGEX> which should match pattern to exclude for <JAIL>"], 
-["set <JAIL> maxtime <TIME>", "TODO"], 
-["set <JAIL> findtime <TIME>", "TODO"], 
-["set <JAIL> bantime <TIME>", "TODO"], 
-["set <JAIL> maxretry <RETRY>", "TODO"], 
-["set <JAIL> addaction <NAME>", "TODO"], 
-["set <JAIL> delaction <NAME>", "TODO"], 
-["set <JAIL> setcinfo <NAME> <VALUE>", "TODO"], 
-["set <JAIL> delcinfo <NAME> <VALUE>", "TODO"], 
-["set <JAIL> actionstart <NAME> <CMD>", "TODO"], 
-["set <JAIL> actionstop <NAME> <CMD>", "TODO"], 
-["set <JAIL> actioncheck <NAME> <CMD>", "TODO"], 
-["set <JAIL> actionban <NAME> <CMD>", "TODO"],
-["set <JAIL> actionunban <NAME> <CMD>", "TODO"], 
+["set <JAIL> maxtime <TIME>", "sets the number of seconds <TIME> a failure stay in the list for <JAIL>"], 
+["set <JAIL> findtime <TIME>", "sets the number of seconds <TIME> for which the filter will look back for <JAIL>"], 
+["set <JAIL> bantime <TIME>", "sets the number of seconds <TIME> a host will be banned for <JAIL>"], 
+["set <JAIL> maxretry <RETRY>", "sets the number of failures <RETRY> before banning the host for <JAIL>"], 
+["set <JAIL> addaction <ACT>", "adds a new action named <NAME> for <JAIL>"], 
+["set <JAIL> delaction <ACT>", "removes the action <NAME> from <JAIL>"], 
+["set <JAIL> setcinfo <ACT> <KEY> <VALUE>", "sets <VALUE> for <KEY> of the action <NAME> for <JAIL>"], 
+["set <JAIL> delcinfo <ACT> <KEY>", "removes <KEY> for the action <NAME> for <JAIL>"], 
+["set <JAIL> actionstart <ACT> <CMD>", "sets the start command <CMD> of the action <ACT> for <JAIL>"], 
+["set <JAIL> actionstop <ACT> <CMD>", "sets the stop command <CMD> of the action <ACT> for <JAIL>"], 
+["set <JAIL> actioncheck <ACT> <CMD>", "sets the check command <CMD> of the action <ACT> for <JAIL>"], 
+["set <JAIL> actionban <ACT> <CMD>", "sets the ban command <CMD> of the action <ACT> for <JAIL>"],
+["set <JAIL> actionunban <ACT> <CMD>", "sets the unban command <CMD> of the action <ACT> for <JAIL>"], 
 ['', ''], 
 ["get <JAIL> <CMD>", "gets the <CMD> value for <JAIL>"],
-["get <JAIL> logpath", "TODO"],
-["get <JAIL> ignoreip", "TODO"],
-["get <JAIL> timeregex", "TODO"],
-["get <JAIL> timepattern", "TODO"],
-["get <JAIL> failregex", "TODO"],
-["get <JAIL> ignoreregex", "TODO"],
-["get <JAIL> maxtime", "TODO"],
-["get <JAIL> findtime", "TODO"],
-["get <JAIL> bantime", "TODO"],
-["get <JAIL> maxretry", "TODO"],
-["get <JAIL> addaction", "TODO"],
-["get <JAIL> actionstart <NAME>", "TODO"],
-["get <JAIL> actionstop <NAME>", "TODO"],
-["get <JAIL> actioncheck <NAME>", "TODO"],
-["get <JAIL> actionban <NAME>", "TODO"],
-["get <JAIL> actionunban <NAME>", "TODO"],
+["get <JAIL> logpath", "gets the list of the monitored files for <JAIL>"],
+["get <JAIL> ignoreip", "gets the list of ignored IP addresses for <JAIL>"],
+["get <JAIL> timeregex", "gets the regular expression used for the time detection for <JAIL>"],
+["get <JAIL> timepattern", "gets the pattern used for the time detection for <JAIL>"],
+["get <JAIL> failregex", "gets the regular expression which matches the failures for <JAIL>"],
+["get <JAIL> ignoreregex", "gets the regular expression which matches patterns to ignore for <JAIL>"],
+["get <JAIL> maxtime", "gets the time a failure stays in the list for <JAIL>"],
+["get <JAIL> findtime", "gets the time for which the filter will look back for failures for <JAIL>"],
+["get <JAIL> bantime", "gets the time a host is banned for <JAIL>"],
+["get <JAIL> maxretry", "gets the number of failures allowed for <JAIL>"],
+["get <JAIL> addaction", "gets the last action which has been added for <JAIL>"],
+["get <JAIL> actionstart <ACT>", "gets the start command for the action <ACT> for <JAIL>"],
+["get <JAIL> actionstop <ACT>", "gets the stop command for the action <ACT> for <JAIL>"],
+["get <JAIL> actioncheck <ACT>", "gets the check command for the action <ACT> for <JAIL>"],
+["get <JAIL> actionban <ACT>", "gets the ban command for the action <ACT> for <JAIL>"],
+["get <JAIL> actionunban <ACT>", "gets the unban command for the action <ACT> for <JAIL>"],
 ['', ''], 
-["start <JAIL>", "starts <JAIL>"], 
-["stop <JAIL>", "stops <JAIL>. The jail is removed"], 
+["start <JAIL>", "starts the jail <JAIL>"], 
+["stop <JAIL>", "stops the jail <JAIL>. The jail is removed"], 
 ["status <JAIL>", "gets the current status of <JAIL>"]
 ]
 
@@ -95,8 +95,8 @@ protocol = [
 
 def printFormatted():
 	INDENT=4
-	MARGIN=37
-	WIDTH=38
+	MARGIN=41
+	WIDTH=34
 	for m in protocol:
 		if m[0] == '':
 			print
diff --git a/man/fail2ban-client.1 b/man/fail2ban-client.1
index 16e4c4b9..0292abd5 100644
--- a/man/fail2ban-client.1
+++ b/man/fail2ban-client.1
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH FAIL2BAN-CLIENT "1" "November 2006" "fail2ban-client v0.7.4" "User Commands"
+.TH FAIL2BAN-CLIENT "1" "November 2006" "fail2ban-client v0.7.4-SVN" "User Commands"
 .SH NAME
 fail2ban-client \- configure and control the server
 .SH SYNOPSIS
 .B fail2ban-client
 [\fIOPTIONS\fR]... \fI<COMMAND>\fR
 .SH DESCRIPTION
-Fail2Ban v0.7.4 reads log file that contains password failure report
+Fail2Ban v0.7.4\-SVN reads log file that contains password failure report
 and bans the corresponding IP addresses using firewall rules.
 .SH OPTIONS
 .TP
@@ -39,46 +39,214 @@ print the version
 .SH COMMAND
 .TP
 start
-start the server and the jails
+starts the server and the jails
 .TP
 reload
-reload the configuration
+reloads the configuration
 .TP
 stop
-stop all jails and terminate the server
+stops all jails and terminate the
+server
 .TP
 status
-get the current status
+gets the current status of the
+server
+.TP
+ping
+tests if the server is alive
 .TP
 set loglevel <LEVEL>
-set loglevel to <LEVEL>
+sets logging level to <LEVEL>. 0
+is minimal, 4 is debug
 .TP
 get loglevel
-get loglevel
+gets the logging level
 .TP
 set logtarget <TARGET>
-set log target to <TARGET>
+sets logging target to <TARGET>.
+Can be STDOUT, STDERR, SYSLOG or a
+file
 .TP
 get logtarget
-get log target
+gets logging target
 .TP
-add <JAIL> [BACKEND]
-create <JAIL> using [BACKEND]
+add <JAIL> <BACKEND>
+creates <JAIL> using <BACKEND>
 .TP
-set <JAIL> <CMD>
-set the <CMD> value for <JAIL>
+set <JAIL> idle on|off
+sets the idle state of <JAIL>
+.TP
+set <JAIL> addignoreip <IP>
+adds <IP> to the ignore list of
+<JAIL>
+.TP
+set <JAIL> delignoreip <IP>
+removes <IP> from the ignore list
+of <JAIL>
+.TP
+set <JAIL> addlogpath <FILE>
+adds <FILE> to the monitoring list
+of <JAIL>
+.TP
+set <JAIL> dellogpath <FILE>
+removes <FILE> to the monitoring
+list of <JAIL>
+.TP
+set <JAIL> timeregex <REGEX>
+sets the regular expression
+<REGEX> to match the date format
+for <JAIL>. This will disable the
+autodetection feature.
+.TP
+set <JAIL> timepattern <PATTERN>
+sets the pattern <PATTERN> to
+match the date format for <JAIL>.
+This will disable the
+autodetection feature.
+.TP
+set <JAIL> failregex <REGEX>
+sets the regular expression
+<REGEX> which must match failures
+for <JAIL>
+.TP
+set <JAIL> ignoreregex <REGEX>
+sets the regular expression
+<REGEX> which should match pattern
+to exclude for <JAIL>
+.TP
+set <JAIL> maxtime <TIME>
+sets the number of seconds <TIME>
+a failure stay in the list for
+<JAIL>
+.TP
+set <JAIL> findtime <TIME>
+sets the number of seconds <TIME>
+for which the filter will look
+back for <JAIL>
+.TP
+set <JAIL> bantime <TIME>
+sets the number of seconds <TIME>
+a host will be banned for <JAIL>
+.TP
+set <JAIL> maxretry <RETRY>
+sets the number of failures
+<RETRY> before banning the host
+for <JAIL>
+.TP
+set <JAIL> addaction <ACT>
+adds a new action named <NAME> for
+<JAIL>
+.TP
+set <JAIL> delaction <ACT>
+removes the action <NAME> from
+<JAIL>
+.TP
+set <JAIL> setcinfo <ACT> <KEY> <VALUE>
+sets <VALUE> for <KEY> of the
+action <NAME> for <JAIL>
+.TP
+set <JAIL> delcinfo <ACT> <KEY>
+removes <KEY> for the action
+<NAME> for <JAIL>
+.TP
+set <JAIL> actionstart <ACT> <CMD>
+sets the start command <CMD> of
+the action <ACT> for <JAIL>
+.TP
+set <JAIL> actionstop <ACT> <CMD>
+sets the stop command <CMD> of the
+action <ACT> for <JAIL>
+.TP
+set <JAIL> actioncheck <ACT> <CMD>
+sets the check command <CMD> of
+the action <ACT> for <JAIL>
+.TP
+set <JAIL> actionban <ACT> <CMD>
+sets the ban command <CMD> of the
+action <ACT> for <JAIL>
+.TP
+set <JAIL> actionunban <ACT> <CMD>
+sets the unban command <CMD> of
+the action <ACT> for <JAIL>
 .TP
 get <JAIL> <CMD>
-get the <CMD> value for <JAIL>
+gets the <CMD> value for <JAIL>
+.TP
+get <JAIL> logpath
+gets the list of the monitored
+files for <JAIL>
+.TP
+get <JAIL> ignoreip
+gets the list of ignored IP
+addresses for <JAIL>
+.TP
+get <JAIL> timeregex
+gets the regular expression used
+for the time detection for <JAIL>
+.TP
+get <JAIL> timepattern
+gets the pattern used for the time
+detection for <JAIL>
+.TP
+get <JAIL> failregex
+gets the regular expression which
+matches the failures for <JAIL>
+.TP
+get <JAIL> ignoreregex
+gets the regular expression which
+matches patterns to ignore for
+<JAIL>
+.TP
+get <JAIL> maxtime
+gets the time a failure stays in
+the list for <JAIL>
+.TP
+get <JAIL> findtime
+gets the time for which the filter
+will look back for failures for
+<JAIL>
+.TP
+get <JAIL> bantime
+gets the time a host is banned for
+<JAIL>
+.TP
+get <JAIL> maxretry
+gets the number of failures
+allowed for <JAIL>
+.TP
+get <JAIL> addaction
+gets the last action which has
+been added for <JAIL>
+.TP
+get <JAIL> actionstart <ACT>
+gets the start command for the
+action <ACT> for <JAIL>
+.TP
+get <JAIL> actionstop <ACT>
+gets the stop command for the
+action <ACT> for <JAIL>
+.TP
+get <JAIL> actioncheck <ACT>
+gets the check command for the
+action <ACT> for <JAIL>
+.TP
+get <JAIL> actionban <ACT>
+gets the ban command for the
+action <ACT> for <JAIL>
+.TP
+get <JAIL> actionunban <ACT>
+gets the unban command for the
+action <ACT> for <JAIL>
 .TP
 start <JAIL>
-start <JAIL>
+starts the jail <JAIL>
 .TP
 stop <JAIL>
-stop <JAIL>. The jail is removed
+stops the jail <JAIL>. The jail is
+removed
 .TP
 status <JAIL>
-get the current status of <JAIL>
+gets the current status of <JAIL>
 .SH FILES
 \fI/etc/fail2ban/*\fR
 .SH AUTHOR
diff --git a/man/fail2ban-regex.1 b/man/fail2ban-regex.1
index afe8f9b4..e83777f8 100644
--- a/man/fail2ban-regex.1
+++ b/man/fail2ban-regex.1
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH FAIL2BAN-REGEX "1" "November 2006" "fail2ban-regex v0.7.4" "User Commands"
+.TH FAIL2BAN-REGEX "1" "November 2006" "fail2ban-regex v0.7.4-SVN" "User Commands"
 .SH NAME
 fail2ban-regex \- test Fail2ban "failregex" option
 .SH SYNOPSIS
 .B fail2ban-regex
 \fI<logline> <failregex>\fR
 .SH DESCRIPTION
-Fail2Ban v0.7.4 reads log file that contains password failure report
+Fail2Ban v0.7.4\-SVN reads log file that contains password failure report
 and bans the corresponding IP addresses using firewall rules.
 .PP
 This tools can test and benchmark your regular expressions for the "failregex"
diff --git a/man/fail2ban-server.1 b/man/fail2ban-server.1
index ded43f8e..e93c3966 100644
--- a/man/fail2ban-server.1
+++ b/man/fail2ban-server.1
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH FAIL2BAN-SERVER "1" "November 2006" "fail2ban-server v0.7.4" "User Commands"
+.TH FAIL2BAN-SERVER "1" "November 2006" "fail2ban-server v0.7.4-SVN" "User Commands"
 .SH NAME
 fail2ban-server \- start the server
 .SH SYNOPSIS
 .B fail2ban-server
 [\fIOPTIONS\fR]
 .SH DESCRIPTION
-Fail2Ban v0.7.4 reads log file that contains password failure report
+Fail2Ban v0.7.4\-SVN reads log file that contains password failure report
 and bans the corresponding IP addresses using firewall rules.
 .PP
 Only use this command for debugging purpose. Start the server with