diff --git a/TODO b/TODO
index 0d8daf11..1ec8cf84 100644
--- a/TODO
+++ b/TODO
@@ -12,6 +12,7 @@
   [x] clean up maxconnections kludges &c
   [x] in-process SSL
   [x] port and use ratbox ssld for server links
+  [ ] merge with libratbox SVN
 [/] ssl stuff
   [x] client-to-client ssl
   [x] server-to-server ssl
@@ -19,12 +20,12 @@
   [x] ssl channelmode (done by extban and chm_compat)
   [ ] acknowledgement message for SSL users like '* *** You are connected using SSL cipher "DHE RSA-AES 128 CBC-SHA"'
   [x] tool for generating ssl certificates and other stuff
-  [ ] gnutls backend for at least SSL connections (replacing libcrypto use in m_challenge would be nice too)
+  [x] gnutls backend for at least SSL connections (replacing libcrypto use in m_challenge would be nice too)
 [x] merge some stuff from ircd-seven directly (to be determined what)
   [x] remote d:lines support
 [F] kline/xline/resv sync
 [F] make an ability of using bandb instead of .conf files as bans storage
-[/] drop non-TS6 (legacy protocol) support
+[x] drop non-TS6 (legacy protocol) support
 [F] Doxygen code documentation
 [/] module engine rework
   [x] more beautiful way of adding new channel modes by module
diff --git a/help/opers/info b/help/opers/info
index 80d93329..09def2b7 100644
--- a/help/opers/info
+++ b/help/opers/info
@@ -1,5 +1,8 @@
-INFO
+INFO [server]
 
 INFO displays the copyright, list of authors and contributors
 to ircd, and the server configuration (as defined in config.h
 and ircd.conf).
+
+If an argument is supplied, the information for the server
+specified will be returned.
diff --git a/help/opers/kill b/help/opers/kill
index b24c2aa0..93153ff6 100644
--- a/help/opers/kill
+++ b/help/opers/kill
@@ -2,4 +2,6 @@ KILL <nick> <reason>
 
 Disconnects user <nick> from the IRC server he/she
 is connected to with reason <reason>.
+
+- Requires Oper Priv: C
 - Requires Oper Priv: O for users not on your IRC server
diff --git a/help/opers/modlist b/help/opers/modlist
index 0abc907e..58c5b0da 100644
--- a/help/opers/modlist
+++ b/help/opers/modlist
@@ -4,4 +4,5 @@ MODLIST [match string]
 ircd, along with their address and version.
 When a match string is provided, modlist only prints
 modules with names matching the match string.
-NOTE:  Restricted to admins only
+
+- Requires Oper Priv: A
diff --git a/help/opers/modload b/help/opers/modload
index ee2bb8b4..4ad68252 100644
--- a/help/opers/modload
+++ b/help/opers/modload
@@ -4,4 +4,5 @@ MODLOAD <[path/]module.so>
 the optional path can be an absolute path
 from / or from the IRCD_PREFIX
 (ie modules/autoload/m_users.so)
-NOTE:  Restricted to admins only
+
+- Requires Oper Priv: A
diff --git a/help/opers/modrestart b/help/opers/modrestart
index d78b531b..12ceb91f 100644
--- a/help/opers/modrestart
+++ b/help/opers/modrestart
@@ -3,4 +3,5 @@ MODRESTART
 -- Reload all modules into the ircd
 All modules are unloaded, then those in modules/autoload
 are loaded
-NOTE:  Restricted to admins only
+
+- Requires Oper Priv: A
diff --git a/help/opers/modunload b/help/opers/modunload
index 6bfcf1e9..4dca1136 100644
--- a/help/opers/modunload
+++ b/help/opers/modunload
@@ -4,4 +4,5 @@ MODUNLOAD <module.so>
 Use just the module name, the path is not needed.
 When a module is unloaded, all commands associated
 with it are unloaded as well.
-NOTE:  Restricted to admins only
+
+- Requires Oper Priv: A
diff --git a/help/opers/oper b/help/opers/oper
index 08962bf2..2156e075 100644
--- a/help/opers/oper
+++ b/help/opers/oper
@@ -5,4 +5,4 @@ argument is the name of the operator as specified in the
 configuration file. The second argument is the password for
 the operator matching the name and host.
 
-The operator privileges are shown on a sucessful OPER.
+The operator privileges are shown on a successful OPER.
diff --git a/help/opers/operwall b/help/opers/operwall
index e3315483..55f49de0 100644
--- a/help/opers/operwall
+++ b/help/opers/operwall
@@ -2,3 +2,5 @@ OPERWALL :<message>
 
 Sends an OPERWALL message of <message> to all
 opers who are umode +z
+
+- Requires Oper Priv: L
diff --git a/help/opers/wallops b/help/opers/wallops
index 3f1e742c..9eec6d23 100644
--- a/help/opers/wallops
+++ b/help/opers/wallops
@@ -4,3 +4,5 @@ Sends a WALLOPS message of <message> to all users
 who are umode +w (including non-opers).
 
 Server sent WALLOPS go to all opers who are umode +w.
+
+- Requires Oper Priv: M