diff --git a/Chanban/cmgmt.tcl b/Chanban/cmgmt.tcl
index b39b5e8..4e8b25e 100644
--- a/Chanban/cmgmt.tcl
+++ b/Chanban/cmgmt.tcl
@@ -140,14 +140,14 @@ namespace eval cmgmt {
     ### Pub Addban - Be aware that this commands expects the mask to properly formatted
     proc addban_pub {nick uhost hand chan text} {
         if {![matchattr $hand o|o $chan]} {
-            putserv "NOTICE $nick :[format [::msgcat::mc error.no.access] $nick]"
+            putserv "NOTICE $nick :[::msgcat::mc error.no.access $nick]"
             return 0
         }
 
         set banmask [lindex [split $text] 0]
 
         if {$banmask eq ""} {
-            putserv "PRIVMSG $chan :[format [::msgcat::mc error.syntax] $::cmgmt::trigger]addban <banmask>"
+            putserv "PRIVMSG $chan :[::msgcat::mc error.syntax $::cmgmt::trigger]addban <banmask>"
             return 0
         }
 
@@ -182,26 +182,26 @@ namespace eval cmgmt {
         }
         newchanban $chan $banmask $nick [::msgcat::mc ban.reason] 0
         pushmode $chan +b $banmask
-        putserv "PRIVMSG $chan :[format [::msgcat::mc ban.added] $banmask $chan]"
+        putserv "PRIVMSG $chan :[::msgcat::mc ban.added $banmask $chan]"
         return 0
     }
 
     ### Pub Ban
     proc ban_pub {nick uhost hand chan text} {
         if {![matchattr $hand o|o $chan]} {
-            putserv "NOTICE $nick :[format [::msgcat::mc error.no.access] $nick]"
+            putserv "NOTICE $nick :[::msgcat::mc error.no.access $nick]"
             return 0
         }
 
         set target [lindex [split $text] 0]
 
         if {$target eq ""} {
-            putserv "PRIVMSG $chan :[format [::msgcat::mc error.syntax] $::cmgmt::trigger]ban <nick>"
+            putserv "PRIVMSG $chan :[::msgcat::mc error.syntax $::cmgmt::trigger]ban <nick>"
             return 0
         }
 
         if {![onchan $target $chan]} {
-            putserv "PRIVMSG $chan :[format [::msgcat::mc not.on.chan] $target $chan]"
+            putserv "PRIVMSG $chan :[::msgcat::mc not.on.chan $target $chan]"
             return 0
         }
 
@@ -211,7 +211,7 @@ namespace eval cmgmt {
         }
 
         if {[isop $target $chan] || [matchattr [nick2hand $target] o|o $chan]} {
-            putserv "NOTICE $nick :[format [::msgcat::mc protected.user] $target]"
+            putserv "NOTICE $nick :[::msgcat::mc protected.user $target]"
             return 0
         }
 
@@ -219,7 +219,7 @@ namespace eval cmgmt {
 
         foreach pmask $::cmgmt::protectMasks {
             if {[matchstr $pmask "${target}!$bhost"] || [matchstr "${target}!$bhost" $pmask]} {
-                putserv "NOTICE $nick :[format [::msgcat::mc protected.user] $target]"
+                putserv "NOTICE $nick :[::msgcat::mc protected.user $target]"
                 return 0
             }
         }
@@ -233,26 +233,26 @@ namespace eval cmgmt {
         newchanban $chan $banmask $nick [::msgcat::mc ban.reason] 0
         pushmode $chan +b $banmask
         putkick $chan $target [::msgcat::mc ban.reason]
-        putserv "PRIVMSG $chan :[format [::msgcat::mc ban.added] $banmask $chan]"
+        putserv "PRIVMSG $chan :[::msgcat::mc ban.added $banmask $chan]"
         return 0
     }
 
     ### Pub Tban
     proc tban_pub {nick uhost hand chan text} {
         if {![matchattr $hand o|o $chan]} {
-            putserv "NOTICE $nick :[format [::msgcat::mc error.no.access] $nick]"
+            putserv "NOTICE $nick :[::msgcat::mc error.no.access $nick]"
             return 0
         }
 
         set target [lindex [split $text] 0]
 
         if {$target eq ""} {
-            putserv "PRIVMSG $chan :[format [::msgcat::mc error.syntax] $::cmgmt::trigger]tban <nick>"
+            putserv "PRIVMSG $chan :[::msgcat::mc error.syntax $::cmgmt::trigger]tban <nick>"
             return 0
         }
 
         if {![onchan $target $chan]} {
-            putserv "PRIVMSG $chan :[format [::msgcat::mc not.on.chan] $target $chan]"
+            putserv "PRIVMSG $chan :[::msgcat::mc not.on.chan $target $chan]"
             return 0
         }
 
@@ -262,7 +262,7 @@ namespace eval cmgmt {
         }
 
         if {[isop $target $chan] || [matchattr [nick2hand $target] o|o $chan]} {
-            putserv "NOTICE $nick :[format [::msgcat::mc protected.user] $target]"
+            putserv "NOTICE $nick :[::msgcat::mc protected.user $target]"
             return 0
         }
 
@@ -270,7 +270,7 @@ namespace eval cmgmt {
 
         foreach pmask $::cmgmt::protectMasks {
             if {[matchstr $pmask "${target}!$bhost"] || [matchstr "${target}!$bhost" $pmask]} {
-                putserv "NOTICE $nick :[format [::msgcat::mc protected.user] $target]"
+                putserv "NOTICE $nick :[::msgcat::mc protected.user $target]"
                 return 0
             }
         }
@@ -284,26 +284,26 @@ namespace eval cmgmt {
         newchanban $chan $banmask $nick [::msgcat::mc temp.ban.reason] $::cmgmt::tBanDuration
         pushmode $chan +b $banmask
         putkick $chan $target [::msgcat::mc temp.ban.reason]
-        putserv "PRIVMSG $chan :[format [::msgcat::mc tmp.ban.added] $banmask $chan]"
+        putserv "PRIVMSG $chan :[::msgcat::mc tmp.ban.added $banmask $chan]"
         return 0
     }
 
     ### Pub Kick
     proc kick_pub {nick uhost hand chan text} {
         if {![matchattr $hand o|o $chan]} {
-            putserv "NOTICE $nick :[format [::msgcat::mc error.no.access] $nick]"
+            putserv "NOTICE $nick :[::msgcat::mc error.no.access $nick]"
             return 0
         }
 
         set target [lindex [split $text] 0]
 
         if {$target eq ""} {
-            putserv "PRIVMSG $chan :[format [::msgcat::mc error.syntax] $::cmgmt::trigger]kick <nick>"
+            putserv "PRIVMSG $chan :[::msgcat::mc error.syntax $::cmgmt::trigger]kick <nick>"
             return 0
         }
 
         if {![onchan $target $chan]} {
-            putserv "PRIVMSG $chan :[format [::msgcat::mc not.on.chan] $target $chan]"
+            putserv "PRIVMSG $chan :[::msgcat::mc not.on.chan $target $chan]"
             return 0
         }
 
@@ -313,7 +313,7 @@ namespace eval cmgmt {
         }
 
         if {[isop $target $chan] || [matchattr [nick2hand $target] o|o $chan]} {
-            putserv "NOTICE $nick :[format [::msgcat::mc protected.user] $target]"
+            putserv "NOTICE $nick :[::msgcat::mc protected.user $target]"
             return 0
         }
 
@@ -324,24 +324,24 @@ namespace eval cmgmt {
     ### Pub Voice
     proc voice_pub {nick uhost hand chan text} {
         if {![matchattr $hand o|o $chan]} {
-            putserv "NOTICE $nick :[format [::msgcat::mc error.no.access] $nick]"
+            putserv "NOTICE $nick :[::msgcat::mc error.no.access $nick]"
             return 0
         }
 
         set target [lindex [split $text] 0]
 
         if {$target eq ""} {
-            putserv "PRIVMSG $chan :[format [::msgcat::mc error.syntax] $::cmgmt::trigger]voice <nick>"
+            putserv "PRIVMSG $chan :[::msgcat::mc error.syntax $::cmgmt::trigger]voice <nick>"
             return 0
         }
 
         if {![onchan $target $chan]} {
-            putserv "PRIVMSG $chan :[format [::msgcat::mc not.on.chan] $target $chan]"
+            putserv "PRIVMSG $chan :[::msgcat::mc not.on.chan $target $chan]"
             return 0
         }
 
         if {[isop $target $chan] || [matchattr [nick2hand $target] o|o $chan]} {
-            putserv "NOTICE $nick :[format [::msgcat::mc protected.user] $target]"
+            putserv "NOTICE $nick :[::msgcat::mc protected.user $target]"
             return 0
         }
 
@@ -352,24 +352,24 @@ namespace eval cmgmt {
     ### Pub Devoice
     proc devoice_pub {nick uhost hand chan text} {
         if {![matchattr $hand o|o $chan]} {
-            putserv "NOTICE $nick :[format [::msgcat::mc error.no.access] $nick]"
+            putserv "NOTICE $nick :[::msgcat::mc error.no.access $nick]"
             return 0
         }
 
         set target [lindex [split $text] 0]
 
         if {$target eq ""} {
-            putserv "PRIVMSG $chan :[format [::msgcat::mc error.syntax] $::cmgmt::trigger]devoice <nick>"
+            putserv "PRIVMSG $chan :[::msgcat::mc error.syntax $::cmgmt::trigger]devoice <nick>"
             return 0
         }
 
         if {![onchan $target $chan]} {
-            putserv "PRIVMSG $chan :[format [::msgcat::mc not.on.chan] $target $chan]"
+            putserv "PRIVMSG $chan :[::msgcat::mc not.on.chan $target $chan]"
             return 0
         }
 
         if {[isop $target $chan] || [matchattr [nick2hand $target] o|o $chan]} {
-            putserv "NOTICE $nick :[format [::msgcat::mc protected.user] $target]"
+            putserv "NOTICE $nick :[::msgcat::mc protected.user $target]"
             return 0
         }
 
@@ -380,39 +380,39 @@ namespace eval cmgmt {
     ### Pub Unban
     proc unban_pub {nick uhost hand chan text} {
         if {![matchattr $hand o|o $chan]} {
-            putserv "NOTICE $nick :[format [::msgcat::mc error.no.access] $nick]"
+            putserv "NOTICE $nick :[::msgcat::mc error.no.access $nick]"
             return 0
         }
 
         set banmask [lindex [split $text] 0]
 
         if {$banmask eq ""} {
-            putserv "PRIVMSG $chan :[format [::msgcat::mc error.syntax] $::cmgmt::trigger]unban <mask>"
+            putserv "PRIVMSG $chan :[::msgcat::mc error.syntax $::cmgmt::trigger]unban <mask>"
             return 0
         }
 
         if {![isban $banmask $chan]} {
-            putserv "PRIVMSG $chan :[format [::msgcat::mc not.ban.mask] $banmask $chan]"
+            putserv "PRIVMSG $chan :[::msgcat::mc not.ban.mask $banmask $chan]"
             return 0
         }
 
         killchanban $chan $banmask
         pushmode $chan -b $banmask
-        putserv "PRIVMSG $chan :[format [::msgcat::mc ban.removed] $banmask $chan]"
+        putserv "PRIVMSG $chan :[::msgcat::mc ban.removed $banmask $chan]"
         return 0
     }
 
     ### Pub Banlist
     proc banlist_pub {nick uhost hand chan text} {
         if {![matchattr $hand o|o $chan]} {
-            putserv "NOTICE $nick :[format [::msgcat::mc error.no.access] $nick]"
+            putserv "NOTICE $nick :[::msgcat::mc error.no.access $nick]"
             return 0
         }
 
         set cbans [banlist $chan]
         set cbans [lsearch -all -inline -not -index 1 $cbans "EXTBAN"]
         if {[llength $cbans] == 0} {
-            putserv "PRIVMSG $chan :[format [::msgcat::mc banlist.empty] $chan]"
+            putserv "PRIVMSG $chan :[::msgcat::mc banlist.empty $chan]"
             return 0
         }
 
@@ -421,7 +421,7 @@ namespace eval cmgmt {
 
         set blist [open $filename "w"]
         set i 1
-        puts $blist "[format [::msgcat::mc banlist.open] $chan $bancount]"
+        puts $blist "[::msgcat::mc banlist.open $chan $bancount]"
         puts $blist ""
 
         foreach botban $cbans {
@@ -435,25 +435,25 @@ namespace eval cmgmt {
             set tstamp [lindex $botban 3]
             set date [clock format $tstamp -format "%d/%m/%Y - %H:%M:%S"]
             set creator [lindex $botban end]
-            puts $blist "\[${i}\] [format [::msgcat::mc banlist.format] $banmask $freason $creator $date]"
+            puts $blist "\[${i}\] [::msgcat::mc banlist.format $banmask $freason $creator $date]"
             puts $blist ""
             incr i
         }
 
-        puts $blist "[format [::msgcat::mc banlist.end] $chan]"
+        puts $blist "[::msgcat::mc banlist.end $chan]"
         puts $blist ""
-        puts $blist "[format [::msgcat::mc banlist.explain] $::cmgmt::trigger]unban <banmask>"
+        puts $blist "[::msgcat::mc banlist.explain $::cmgmt::trigger]unban <banmask>"
         close $blist
 
         if {[catch {
             set result [exec cat $filename | {*}$::cmgmt::upCommand]
         } err]} {
-            putserv "PRIVMSG $chan :[format [::msgcat::mc banlist.upload.fail] $err]"
+            putserv "PRIVMSG $chan :[::msgcat::mc banlist.upload.fail $err]"
             file delete $filename
             return 0
         }
 
-        putserv "PRIVMSG $chan :[format [::msgcat::mc banlist.url] $chan $result]"
+        putserv "PRIVMSG $chan :[::msgcat::mc banlist.url $chan $result]"
         file delete $filename
         return 0
     }
@@ -461,7 +461,7 @@ namespace eval cmgmt {
     ### Pub Autoadd
     proc autoban_pub {nick uhost hand chan text} {
         if {![matchattr $hand o|o $chan]} {
-            putserv "NOTICE $nick :[format [::msgcat::mc error.no.access] $nick]"
+            putserv "NOTICE $nick :[::msgcat::mc error.no.access $nick]"
             return 0
         }
 
@@ -470,22 +470,22 @@ namespace eval cmgmt {
         switch $option {
             on {
                 if {[channel get $chan addBans]} {
-                    putserv "PRIVMSG $chan :[format [::msgcat::mc autoadd.enabled] $chan]"
+                    putserv "PRIVMSG $chan :[::msgcat::mc autoadd.enabled $chan]"
                     return 0
                 } else {
                     channel set $chan +addBans
-                    putserv "PRIVMSG $chan :[format [::msgcat::mc autoadd.enable] $chan]"
+                    putserv "PRIVMSG $chan :[::msgcat::mc autoadd.enable $chan]"
                     return 0
                 }
             }
 
             off {
                 if {![channel get $chan addBans]} {
-                    putserv "PRIVMSG $chan :[format [::msgcat::mc autoadd.disabled] $chan]"
+                    putserv "PRIVMSG $chan :[::msgcat::mc autoadd.disabled $chan]"
                     return 0
                 } else {
                     channel set $chan -addBans
-                    putserv "PRIVMSG $chan :[format [::msgcat::mc autoadd.disable] $chan]"
+                    putserv "PRIVMSG $chan :[::msgcat::mc autoadd.disable $chan]"
                     return 0
                 }
             }
@@ -496,12 +496,12 @@ namespace eval cmgmt {
                 } else {
                     set turned "disabled"
                 }
-                putserv "PRIVMSG $chan :[format [::msgcat::mc autoadd.status] $turned $chan]"
+                putserv "PRIVMSG $chan :[::msgcat::mc autoadd.status $turned $chan]"
                 return 0
             }
 
             default {
-                putserv "PRIVMSG $chan :[format [::msgcat::mc error.syntax] $::cmgmt::trigger]autoadd <on/off/status>"
+                putserv "PRIVMSG $chan :[::msgcat::mc error.syntax $::cmgmt::trigger]autoadd <on/off/status>"
                 return 0
             }
         }
@@ -511,11 +511,11 @@ namespace eval cmgmt {
     ### Pub OPcmds
     proc opcmds_pub {nick uhost hand chan text} {
         if {![matchattr $hand o|o $chan]} {
-            putserv "NOTICE $nick :[format [::msgcat::mc error.no.access] $nick]"
+            putserv "NOTICE $nick :[::msgcat::mc error.no.access $nick]"
             return 0
         }
 
-        putserv "PRIVMSG $chan :[format [::msgcat::mc cmgmt.cmds] $::cmgmt::trigger]"
+        putserv "PRIVMSG $chan :[::msgcat::mc cmgmt.cmds $::cmgmt::trigger]"
         return 0
     }
 
@@ -524,17 +524,17 @@ namespace eval cmgmt {
         set target [lindex [split $text] 0]
 
         if {![matchattr $hand n]} {
-            putserv "NOTICE $nick :[format [::msgcat::mc error.no.access] $nick]"
+            putserv "NOTICE $nick :[::msgcat::mc error.no.access $nick]"
             return 0
         }
 
         if {$target eq ""} {
-            putserv "PRIVMSG $chan :[format [::msgcat::mc error.syntax] $::cmgmt::trigger]addop <nick>"
+            putserv "PRIVMSG $chan :[::msgcat::mc error.syntax $::cmgmt::trigger]addop <nick>"
             return 0
         }
 
         if {![onchan $target $chan]} {
-            putserv "PRIVMSG $chan :[format [::msgcat::mc not.on.chan] $target $chan]"
+            putserv "PRIVMSG $chan :[::msgcat::mc not.on.chan $target $chan]"
             return 0
         }
 
@@ -546,18 +546,18 @@ namespace eval cmgmt {
 
         if {[validuser $target]} {
             if {[matchattr [nick2hand $target] mno|o $chan]} {
-                putserv "PRIVMSG $chan :[format [::msgcat::mc got.oflag] $target $chan]"
+                putserv "PRIVMSG $chan :[::msgcat::mc got.oflag $target $chan]"
                 return 0
             } else {
                 chattr $target |+o $chan
-                putserv "PRIVMSG $chan :[format [::msgcat::mc added.chanop] $target $chan]"
+                putserv "PRIVMSG $chan :[::msgcat::mc added.chanop $target $chan]"
                 return 0
             }
         }
 
         adduser $target $opMask
         chattr $target |+o $chan
-        putserv "PRIVMSG $chan :[format [::msgcat::mc added.chanop] $target $chan]"
+        putserv "PRIVMSG $chan :[::msgcat::mc added.chanop $target $chan]"
         return 0
     }
 
@@ -566,19 +566,19 @@ namespace eval cmgmt {
         set visop 0
 
         if {![matchattr $hand n]} {
-            putserv "NOTICE $nick :[format [::msgcat::mc error.no.access] $nick]"
+            putserv "NOTICE $nick :[::msgcat::mc error.no.access $nick]"
             return 0
         }
 
         set target [lindex [split $text] 0]
 
         if {$target eq ""} {
-            putserv "PRIVMSG $chan :[format [::msgcat::mc error.syntax] $::cmgmt::trigger]delop <nick>"
+            putserv "PRIVMSG $chan :[::msgcat::mc error.syntax $::cmgmt::trigger]delop <nick>"
             return 0
         }
 
         if {![validuser $target]} {
-            putserv "PRIVMSG $chan :[format [::msgcat::mc inexistent.user] $target]"
+            putserv "PRIVMSG $chan :[::msgcat::mc inexistent.user $target]"
             return 0
         }
 
@@ -593,11 +593,11 @@ namespace eval cmgmt {
 
         if {$visop == 0 && ![matchattr $user mno]} {
             deluser $user
-            putserv "PRIVMSG $chan :[format [::msgcat::mc op.deleted] $target $chan]"
-            putserv "NOTICE $nick :[format [::msgcat::mc db.user.deleted] $target]"
+            putserv "PRIVMSG $chan :[::msgcat::mc op.deleted $target $chan]"
+            putserv "NOTICE $nick :[::msgcat::mc db.user.deleted $target]"
             return 0
         } else {
-            putserv "PRIVMSG $chan :[format [::msgcat::mc op.deleted] $target $chan]"
+            putserv "PRIVMSG $chan :[::msgcat::mc op.deleted $target $chan]"
             return 0
         }
     }
@@ -605,11 +605,11 @@ namespace eval cmgmt {
     # Pub Ops
     proc chanops_pub {nick uhost hand chan text} {
         if {![matchattr $hand n]} {
-            putserv "NOTICE $nick :[format [::msgcat::mc error.no.access] $nick]"
+            putserv "NOTICE $nick :[::msgcat::mc error.no.access $nick]"
             return 0
         }
 
-        putserv "PRIVMSG $chan :[format [::msgcat::mc chanop.list] $chan] [join [userlist |o $chan] {, }]"
+        putserv "PRIVMSG $chan :[::msgcat::mc chanop.list $chan] [join [userlist |o $chan] {, }]"
         return 0
     }
 
@@ -627,7 +627,7 @@ namespace eval cmgmt {
         }
 
         if {![matchattr $hand o|o $chan]} {
-            putserv "NOTICE $nick :[format [::msgcat::mc error.no.access] $nick]"
+            putserv "NOTICE $nick :[::msgcat::mc error.no.access $nick]"
             return 0
         }
 
@@ -669,7 +669,7 @@ namespace eval cmgmt {
         }
         newchanban $chan $banmask $nick [::msgcat::mc ban.reason] 0
         pushmode $chan +b $banmask
-        putserv "PRIVMSG $nick :[format [::msgcat::mc ban.added] $banmask $chan]"
+        putserv "PRIVMSG $nick :[::msgcat::mc ban.added $banmask $chan]"
         return 0
     }
 
@@ -683,12 +683,12 @@ namespace eval cmgmt {
         }
 
         if {![validchan $chan]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc bot.not.onchan] $chan]"
+            putserv "PRIVMSG $nick :[::msgcat::mc bot.not.onchan $chan]"
             return 0
         }
 
         if {![matchattr $hand o|o $chan]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc error.no.access] $nick]"
+            putserv "PRIVMSG $nick :[::msgcat::mc error.no.access $nick]"
             return 0
         }
 
@@ -700,7 +700,7 @@ namespace eval cmgmt {
         }
 
         if {![onchan $target $chan]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc not.on.chan] $target $chan]"
+            putserv "PRIVMSG $nick :[::msgcat::mc not.on.chan $target $chan]"
             return 0
         }
 
@@ -710,7 +710,7 @@ namespace eval cmgmt {
         }
 
         if {[isop $target $chan] || [matchattr [nick2hand $target] o|o $chan]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc protected.user] $target]"
+            putserv "PRIVMSG $nick :[::msgcat::mc protected.user $target]"
             return 0
         }
 
@@ -718,7 +718,7 @@ namespace eval cmgmt {
 
         foreach pmask $::cmgmt::protectMasks {
             if {[matchstr $pmask "${target}!$bhost"] || [matchstr "${target}!$bhost" $pmask]} {
-                putserv "PRIVMSG $nick :[format [::msgcat::mc protected.user] $target]"
+                putserv "PRIVMSG $nick :[::msgcat::mc protected.user $target]"
                 return 0
             }
         }
@@ -732,7 +732,7 @@ namespace eval cmgmt {
         newchanban $chan $banmask $nick [::msgcat::mc ban.reason] 0
         pushmode $chan +b $banmask
         putkick $chan $target [::msgcat::mc ban.reason]
-        putserv "PRIVMSG $nick :[format [::msgcat::mc ban.added] $banmask $chan]"
+        putserv "PRIVMSG $nick :[::msgcat::mc ban.added $banmask $chan]"
         return 0
     }
 
@@ -746,12 +746,12 @@ namespace eval cmgmt {
         }
 
         if {![validchan $chan]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc bot.not.onchan] $chan]"
+            putserv "PRIVMSG $nick :[::msgcat::mc bot.not.onchan $chan]"
             return 0
         }
 
         if {![matchattr $hand o|o $chan]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc error.no.access] $nick]"
+            putserv "PRIVMSG $nick :[::msgcat::mc error.no.access $nick]"
             return 0
         }
 
@@ -763,7 +763,7 @@ namespace eval cmgmt {
         }
 
         if {![onchan $target $chan]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc not.on.chan] $target $chan]"
+            putserv "PRIVMSG $nick :[::msgcat::mc not.on.chan $target $chan]"
             return 0
         }
 
@@ -773,7 +773,7 @@ namespace eval cmgmt {
         }
 
         if {[isop $target $chan] || [matchattr [nick2hand $target] o|o $chan]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc protected.user] $target]"
+            putserv "PRIVMSG $nick :[::msgcat::mc protected.user $target]"
             return 0
         }
 
@@ -781,7 +781,7 @@ namespace eval cmgmt {
 
         foreach pmask $::cmgmt::protectMasks {
             if {[matchstr $pmask "${target}!$bhost"] || [matchstr "${target}!$bhost" $pmask]} {
-                putserv "PRIVMSG $nick :[format [::msgcat::mc protected.user] $target]"
+                putserv "PRIVMSG $nick :[::msgcat::mc protected.user $target]"
                 return 0
             }
         }
@@ -795,7 +795,7 @@ namespace eval cmgmt {
         newchanban $chan $banmask $nick [::msgcat::mc temp.ban.reason] $::cmgmt::tBanDuration
         pushmode $chan +b $banmask
         putkick $chan $target [::msgcat::mc temp.ban.reason]
-        putserv "PRIVMSG $nick :[format [::msgcat::mc tmp.ban.added] $banmask $chan]"
+        putserv "PRIVMSG $nick :[::msgcat::mc tmp.ban.added $banmask $chan]"
         return 0
     }
 
@@ -809,12 +809,12 @@ namespace eval cmgmt {
         }
 
         if {![validchan $chan]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc bot.not.onchan] $chan]"
+            putserv "PRIVMSG $nick :[::msgcat::mc bot.not.onchan $chan]"
             return 0
         }
 
         if {![matchattr $hand o|o $chan]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc error.no.access] $nick]"
+            putserv "PRIVMSG $nick :[::msgcat::mc error.no.access $nick]"
             return 0
         }
 
@@ -826,7 +826,7 @@ namespace eval cmgmt {
         }
 
         if {![onchan $target $chan]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc not.on.chan] $target $chan]"
+            putserv "PRIVMSG $nick :[::msgcat::mc not.on.chan $target $chan]"
             return 0
         }
 
@@ -836,7 +836,7 @@ namespace eval cmgmt {
         }
 
         if {[isop $target $chan] || [matchattr [nick2hand $target] o|o $chan]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc protected.user] $target]"
+            putserv "PRIVMSG $nick :[::msgcat::mc protected.user $target]"
             return 0
         }
         putkick $chan $target [::msgcat::mc kick.reason]
@@ -853,12 +853,12 @@ namespace eval cmgmt {
         }
 
         if {![validchan $chan]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc bot.not.onchan] $chan]"
+            putserv "PRIVMSG $nick :[::msgcat::mc bot.not.onchan $chan]"
             return 0
         }
 
         if {![matchattr $hand o|o $chan]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc error.no.access] $nick]"
+            putserv "PRIVMSG $nick :[::msgcat::mc error.no.access $nick]"
             return 0
         }
 
@@ -870,7 +870,7 @@ namespace eval cmgmt {
         }
 
         if {![onchan $target $chan]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc not.on.chan] $target $chan]"
+            putserv "PRIVMSG $nick :[::msgcat::mc not.on.chan $target $chan]"
             return 0
         }
 
@@ -888,12 +888,12 @@ namespace eval cmgmt {
         }
 
         if {![validchan $chan]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc bot.not.onchan] $chan]"
+            putserv "PRIVMSG $nick :[::msgcat::mc bot.not.onchan $chan]"
             return 0
         }
 
         if {![matchattr $hand o|o $chan]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc error.no.access] $nick]"
+            putserv "PRIVMSG $nick :[::msgcat::mc error.no.access $nick]"
             return 0
         }
 
@@ -905,7 +905,7 @@ namespace eval cmgmt {
         }
 
         if {![onchan $target $chan]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc not.on.chan] $target $chan]"
+            putserv "PRIVMSG $nick :[::msgcat::mc not.on.chan $target $chan]"
             return 0
         }
 
@@ -923,12 +923,12 @@ namespace eval cmgmt {
         }
 
         if {![validchan $chan]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc bot.not.onchan] $chan]"
+            putserv "PRIVMSG $nick :[::msgcat::mc bot.not.onchan $chan]"
             return 0
         }
 
         if {![matchattr $hand o|o $chan]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc error.no.access] $nick]"
+            putserv "PRIVMSG $nick :[::msgcat::mc error.no.access $nick]"
             return 0
         }
 
@@ -940,13 +940,13 @@ namespace eval cmgmt {
         }
 
         if {![isban $banmask $chan]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc not.ban.mask] $banmask $chan]"
+            putserv "PRIVMSG $nick :[::msgcat::mc not.ban.mask $banmask $chan]"
             return 0
         }
 
         killchanban $chan $banmask
         pushmode $chan -b $banmask
-        putserv "PRIVMSG $nick :[format [::msgcat::mc ban.removed] $banmask $chan]"
+        putserv "PRIVMSG $nick :[::msgcat::mc ban.removed $banmask $chan]"
         return 0
     }
 
@@ -955,24 +955,24 @@ namespace eval cmgmt {
         set chan [lindex [split $text] 0]
 
         if {![matchstr "#*" $chan]} {
-            putserv "PRIVMSG $nick :[::msgcat::mc pm.error.syntax] unban <#chan> <nick>"
+            putserv "PRIVMSG $nick :[::msgcat::mc pm.error.syntax] banlist <#chan> <nick>"
             return 0
         }
 
         if {![validchan $chan]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc bot.not.onchan] $chan]"
+            putserv "PRIVMSG $nick :[::msgcat::mc bot.not.onchan $chan]"
             return 0
         }
 
         if {![matchattr $hand o|o $chan]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc error.no.access] $nick]"
+            putserv "PRIVMSG $nick :[::msgcat::mc error.no.access $nick]"
             return 0
         }
 
         set cbans [banlist $chan]
         set cbans [lsearch -all -inline -not -index 1 $cbans "EXTBAN"]
         if {[llength $cbans] == 0} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc banlist.empty] $chan]"
+            putserv "PRIVMSG $nick :[::msgcat::mc banlist.empty $chan]"
             return 0
         }
 
@@ -981,7 +981,7 @@ namespace eval cmgmt {
 
         set blist [open $filename "w"]
         set i 1
-        puts $blist "[format [::msgcat::mc banlist.open] $chan $bancount]"
+        puts $blist "[::msgcat::mc banlist.open $chan $bancount]"
         puts $blist ""
 
         foreach botban $cbans {
@@ -995,25 +995,25 @@ namespace eval cmgmt {
             set tstamp [lindex $botban 3]
             set date [clock format $tstamp -format "%d/%m/%Y - %H:%M:%S"]
             set creator [lindex $botban end]
-            puts $blist "\[${i}\] [format [::msgcat::mc banlist.format] $banmask $freason $creator $date]"
+            puts $blist "\[${i}\] [::msgcat::mc banlist.format $banmask $freason $creator $date]"
             puts $blist ""
             incr i
         }
 
-        puts $blist "[format [::msgcat::mc banlist.end] $chan]"
+        puts $blist "[::msgcat::mc banlist.end $chan]"
         puts $blist ""
-        puts $blist "[format [::msgcat::mc pm.banlist.explain] $::botnick] unban <banmask>"
+        puts $blist "[::msgcat::mc pm.banlist.explain $::botnick] unban <banmask>"
         close $blist
 
         if {[catch {
             set result [exec cat $filename | {*}$::cmgmt::upCommand]
         } err]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc banlist.upload.fail] $err]"
+            putserv "PRIVMSG $nick :[::msgcat::mc banlist.upload.fail $err]"
             file delete $filename
             return 0
         }
 
-        putserv "PRIVMSG $nick :[format [::msgcat::mc banlist.url] $chan $result]"
+        putserv "PRIVMSG $nick :[::msgcat::mc banlist.url $chan $result]"
         file delete $filename
         return 0
     }
@@ -1028,12 +1028,12 @@ namespace eval cmgmt {
         }
 
         if {![validchan $chan]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc bot.not.onchan] $chan]"
+            putserv "PRIVMSG $nick :[::msgcat::mc bot.not.onchan $chan]"
             return 0
         }
 
         if {![matchattr $hand o|o $chan]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc error.no.access] $nick]"
+            putserv "PRIVMSG $nick :[::msgcat::mc error.no.access $nick]"
             return 0
         }
 
@@ -1042,33 +1042,33 @@ namespace eval cmgmt {
         switch $option {
             on {
                 if {[channel get $chan addBans]} {
-                    putserv "PRIVMSG $nick :[format [::msgcat::mc autoadd.enabled] $chan]"
+                    putserv "PRIVMSG $nick :[::msgcat::mc autoadd.enabled $chan]"
                     return 0
                 } else {
                     channel set $chan +addBans
-                    putserv "PRIVMSG $nick :[format [::msgcat::mc autoadd.enable] $chan]"
+                    putserv "PRIVMSG $nick :[::msgcat::mc autoadd.enable $chan]"
                     return 0
                 }
             }
 
             off {
                 if {![channel get $chan addBans]} {
-                    putserv "PRIVMSG $nick :[format [::msgcat::mc autoadd.disabled] $chan]"
+                    putserv "PRIVMSG $nick :[::msgcat::mc autoadd.disabled $chan]"
                     return 0
                 } else {
                     channel set $chan -addBans
-                    putserv "PRIVMSG $nick :[format [::msgcat::mc autoadd.disable] $chan]"
+                    putserv "PRIVMSG $nick :[::msgcat::mc autoadd.disable $chan]"
                     return 0
                 }
             }
 
             status {
                 if {[channel get $chan addBans]} {
-                    set turned "enabled"
+                    set turned [::msgcat::mc is.enabled]
                 } else {
-                    set turned "disabled"
+                    set turned [::msgcat::mc is.disabled]
                 }
-                putserv "PRIVMSG $nick :[format [::msgcat::mc autoadd.status] $turned $chan]"
+                putserv "PRIVMSG $nick :[::msgcat::mc autoadd.status $turned $chan]"
                 return 0
             }
 
@@ -1090,16 +1090,16 @@ namespace eval cmgmt {
         }
 
         if {![validchan $chan]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc bot.not.onchan] $chan]"
+            putserv "PRIVMSG $nick :[::msgcat::mc bot.not.onchan $chan]"
             return 0
         }
 
         if {![matchattr $hand o|o $chan]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc error.no.access] $nick]"
+            putserv "PRIVMSG $nick :[::msgcat::mc error.no.access $nick]"
             return 0
         }
 
-        putserv "PRIVMSG $nick :[::msgcat::mc msg.cmgmt.cmds] "
+        putserv "PRIVMSG $nick :[::msgcat::mc msg.cmgmt.cmds]"
         return 0
     }
 
@@ -1113,24 +1113,24 @@ namespace eval cmgmt {
         }
 
         if {![validchan $chan]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc bot.not.onchan] $chan]"
+            putserv "PRIVMSG $nick :[::msgcat::mc bot.not.onchan $chan]"
             return 0
         }
 
         if {![matchattr $hand n]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc error.no.access] $nick]"
+            putserv "PRIVMSG $nick :[::msgcat::mc error.no.access $nick]"
             return 0
         }
 
         set target [lindex [split $text] 1]
 
         if {$target eq ""} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc error.syntax] $::cmgmt::trigger]addop <#chan> <nick>"
+            putserv "PRIVMSG $nick :[::msgcat::mc error.syntax $::cmgmt::trigger]addop <#chan> <nick>"
             return 0
         }
 
         if {![onchan $target $chan]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc not.on.chan] $target $chan]"
+            putserv "PRIVMSG $nick :[::msgcat::mc not.on.chan $target $chan]"
             return 0
         }
 
@@ -1142,18 +1142,18 @@ namespace eval cmgmt {
 
         if {[validuser $target]} {
             if {[matchattr [nick2hand $target] mno|o $chan]} {
-                putserv "PRIVMSG $nick :[format [::msgcat::mc got.oflag] $target $chan]"
+                putserv "PRIVMSG $nick :[::msgcat::mc got.oflag $target $chan]"
                 return 0
             } else {
                 chattr $target |+o $chan
-                putserv "PRIVMSG $nick :[format [::msgcat::mc added.chanop] $target $chan]"
+                putserv "PRIVMSG $nick :[::msgcat::mc added.chanop $target $chan]"
                 return 0
             }
         }
 
         adduser $target $opMask
         chattr $target |+o $chan
-        putserv "PRIVMSG $nick :[format [::msgcat::mc added.chanop] $target $chan]"
+        putserv "PRIVMSG $nick :[::msgcat::mc added.chanop $target $chan]"
         return 0
     }
 
@@ -1168,24 +1168,24 @@ namespace eval cmgmt {
         }
 
         if {![validchan $chan]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc bot.not.onchan] $chan]"
+            putserv "PRIVMSG $nick :[::msgcat::mc bot.not.onchan $chan]"
             return 0
         }
 
         if {![matchattr $hand n]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc error.no.access] $nick]"
+            putserv "PRIVMSG $nick :[::msgcat::mc error.no.access $nick]"
             return 0
         }
 
         set target [lindex [split $text] 1]
 
         if {$target eq ""} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc error.syntax] $::cmgmt::trigger]delop <#chan> <nick>"
+            putserv "PRIVMSG $nick :[::msgcat::mc error.syntax $::cmgmt::trigger]delop <#chan> <nick>"
             return 0
         }
 
         if {![validuser $target]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc inexistent.user] $target]"
+            putserv "PRIVMSG $nick :[::msgcat::mc inexistent.user $target]"
             return 0
         }
 
@@ -1200,11 +1200,11 @@ namespace eval cmgmt {
 
         if {$visop == 0 && ![matchattr $user mno]} {
             deluser $user
-            putserv "PRIVMSG $nick :[format [::msgcat::mc op.deleted] $target $chan]"
-            putserv "PRIVMSG $nick :[format [::msgcat::mc db.user.deleted] $target]"
+            putserv "PRIVMSG $nick :[::msgcat::mc op.deleted $target $chan]"
+            putserv "PRIVMSG $nick :[::msgcat::mc db.user.deleted $target]"
             return 0
         } else {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc op.deleted] $target $chan]"
+            putserv "PRIVMSG $nick :[::msgcat::mc op.deleted $target $chan]"
             return 0
         }
     }
@@ -1219,16 +1219,16 @@ namespace eval cmgmt {
         }
 
         if {![validchan $chan]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc bot.not.onchan] $chan]"
+            putserv "PRIVMSG $nick :[::msgcat::mc bot.not.onchan $chan]"
             return 0
         }
 
         if {![matchattr $hand n]} {
-            putserv "PRIVMSG $nick :[format [::msgcat::mc error.no.access] $nick]"
+            putserv "PRIVMSG $nick :[::msgcat::mc error.no.access $nick]"
             return 0
         }
 
-        putserv "PRIVMSG $nick :[format [::msgcat::mc chanop.list] $chan] [join [userlist |o $chan] {, }]"
+        putserv "PRIVMSG $nick :[::msgcat::mc chanop.list $chan] [join [userlist |o $chan] {, }]"
         return 0
     }
 
@@ -1279,7 +1279,7 @@ namespace eval cmgmt {
                 return 0
             } else {
                 newchanban $chan $target $nick $banReason 0
-                putserv "NOTICE @$chan :[format [::msgcat::mc auto.added] $target $chan]"
+                putserv "NOTICE @$chan :[::msgcat::mc auto.added $target $chan]"
                 return 0
             }
         }
@@ -1300,8 +1300,6 @@ namespace eval cmgmt {
         }
     }
 
-
-
     # Lets check for existing extbans and add them to our ban list
     # and make them sticky so the bot doesn't remove them
     bind cron * "*/5 * * * *" ::cmgmt::addextbans