diff --git a/Irpg/Main.pm b/Irpg/Main.pm
index d94a92f19e236130008bb3934a6d71b8f7a9f8fc..40907687f7b8b0a4fdfcc8a53cda2218a1538b57 100644
--- a/Irpg/Main.pm
+++ b/Irpg/Main.pm
@@ -605,7 +605,7 @@ sub help {
     }
 
     if ($ctxt eq 'prv' && ha($usernick) && !exists($arg[0])) {
-        $ret .= "Admin commands URL is $opts->{admincommurl}";
+        $ret .= "\nAdmin commands URL is $opts->{admincommurl}";
     }
     Irpg::Irc::privmsg($ret, $source);
 }
@@ -615,11 +615,6 @@ my ($k, $v);
 foreach (qw(Quest Action Event Admin Users)) {
     eval 'while (($k,$v) = each %$Irpg::'.$_.'::commands) {$commands{$k} = $v;}';
 }
-#while (($k,$v) = each %$Irpg::Quest::commands) {$commands{$k} = $v;}
-#while (($k,$v) = each %$Irpg::Action::commands) {$commands{$k} = $v;}
-#while (($k,$v) = each %$Irpg::Event::commands) {$commands{$k} = $v;}
-#while (($k,$v) = each %$Irpg::Admin::commands) {$commands{$k} = $v;}
-#while (($k,$v) = each %$Irpg::Users::commands) {$commands{$k} = $v;}
 undef $k;
 undef $v;
 
diff --git a/Irpg/Users.pm b/Irpg/Users.pm
index 4b7592c8155ded94d50a4c2cc597f74cf616ca75..aebe2cd889f432717a29860061c5ecf8402e4196 100644
--- a/Irpg/Users.pm
+++ b/Irpg/Users.pm
@@ -380,7 +380,7 @@ sub points {
     Irpg::Irc::privmsg("You sure feel more competent now!", $usernick);
 }
 
-sub class {
+sub getclass {
     my ($userhost, $usernick, $username, $source, @arg) = @_;
     if (!defined($username)) {
         Irpg::Irc::notice("You are not logged in.", $usernick);
@@ -442,7 +442,7 @@ sub chclass {
             $rps->{$username}{class} = $new_class;
             Irpg::Main::penalize($username, 'chclass');
             # show the new class
-            class($userhost,$usernick,$username,$source);
+            getclass($userhost,$usernick,$username,$source);
             Irpg::Irc::chanmsg("$username has trained hard following the ".
                 "demanding path ".pronoun(1, $rps->{$username}{gender}).
                 " has chosen, and ".pronoun(2, $rps->{$username}{gender}).
@@ -506,7 +506,7 @@ our $commands = {
                          'or adds n points to your stat. '.
                          'stats are {str, con, wis, int, cha, dex}.'},
 
-    class    => {ref => \&class, adm => 0, prv => 1, pub => 1,
+    class    => {ref => \&getclass, adm => 0, prv => 1, pub => 1,
                  hlp => 'CLASS [<usernick>|<char name>]: gives the class info '.
                         'of a character, or of a usernick\'s character. '.
                         'Yours by default.'},