diff --git a/PBot/BotAdminCommands.pm b/PBot/BotAdminCommands.pm
index d5540fd1..c05c52ca 100644
--- a/PBot/BotAdminCommands.pm
+++ b/PBot/BotAdminCommands.pm
@@ -34,15 +34,15 @@ sub initialize {
   
   $pbot->{commands}->register(sub { return $self->login(@_)        },       "login",         0);
   $pbot->{commands}->register(sub { return $self->logout(@_)       },       "logout",        0);
-  $pbot->{commands}->register(sub { return $self->join_channel(@_) },       "join",          45);
-  $pbot->{commands}->register(sub { return $self->part_channel(@_) },       "part",          45);
-  $pbot->{commands}->register(sub { return $self->ack_die(@_)      },       "die",           50);
+  $pbot->{commands}->register(sub { return $self->join_channel(@_) },       "join",          40);
+  $pbot->{commands}->register(sub { return $self->part_channel(@_) },       "part",          40);
+  $pbot->{commands}->register(sub { return $self->ack_die(@_)      },       "die",           90);
   $pbot->{commands}->register(sub { return $self->adminadd(@_)     },       "adminadd",      60);
   $pbot->{commands}->register(sub { return $self->adminrem(@_)     },       "adminrem",      60);
   $pbot->{commands}->register(sub { return $self->adminset(@_)     },       "adminset",      60);
   $pbot->{commands}->register(sub { return $self->adminunset(@_)   },       "adminunset",    60);
-  $pbot->{commands}->register(sub { return $self->sl(@_)           },       "sl",            60);
-  $pbot->{commands}->register(sub { return $self->export(@_)       },       "export",        60);
+  $pbot->{commands}->register(sub { return $self->sl(@_)           },       "sl",            90);
+  $pbot->{commands}->register(sub { return $self->export(@_)       },       "export",        90);
 }
 
 sub sl {
@@ -129,7 +129,7 @@ sub adminset {
   my ($channel, $hostmask, $key, $value) = split / /, $arguments, 4 if defined $arguments;
 
   if(not defined $channel or not defined $hostmask) {
-    return "Usage: adminset <channel> <hostmask/name> <key> <value>";
+    return "Usage: adminset <channel> <hostmask/name> [key] [value]";
   }
 
   $channel = lc $channel;
diff --git a/PBot/Channels.pm b/PBot/Channels.pm
index 053e578b..827c5226 100644
--- a/PBot/Channels.pm
+++ b/PBot/Channels.pm
@@ -43,7 +43,7 @@ sub set {
   my ($channel, $key, $value) = split / /, $arguments, 3;
 
   if(not defined $channel) {
-    return "Usage: chanset <channel> [key <value>]";
+    return "Usage: chanset <channel> [key [value]]";
   }
 
   return $self->{channels}->set($channel, $key, $value);
diff --git a/PBot/FactoidCommands.pm b/PBot/FactoidCommands.pm
index 39956908..59b146ee 100644
--- a/PBot/FactoidCommands.pm
+++ b/PBot/FactoidCommands.pm
@@ -26,18 +26,18 @@ sub new {
 
 # TODO - move this someplace better so it can be more accessible to user-customisation
 my %factoid_metadata_levels = (
-  created_on                  => 999,
+  created_on                  => 90,
   enabled                     => 10,
-  last_referenced_in          => 60,
-  last_referenced_on          => 60,
-  modulelauncher_subpattern   => 60,
-  owner                       => 60,
+  last_referenced_in          => 90,
+  last_referenced_on          => 90,
+  modulelauncher_subpattern   => 90,
+  owner                       => 90,
   rate_limit                  => 10,
-  ref_count                   => 60,
-  ref_user                    => 60,
-  type                        => 60,
-  edited_by                   => 60,
-  edited_on                   => 60,
+  ref_count                   => 90,
+  ref_user                    => 90,
+  type                        => 90,
+  edited_by                   => 90,
+  edited_on                   => 90,
   locked                      => 10,
   add_nick                    => 10,
   nooverride                  => 10,
@@ -71,8 +71,8 @@ sub initialize {
   $pbot->{commands}->register(sub { return $self->factfind(@_)        },       "factfind",     0);
   $pbot->{commands}->register(sub { return $self->list(@_)            },       "list",         0);
   $pbot->{commands}->register(sub { return $self->top20(@_)           },       "top20",        0);
-  $pbot->{commands}->register(sub { return $self->load_module(@_)     },       "load",        60);
-  $pbot->{commands}->register(sub { return $self->unload_module(@_)   },       "unload",      60);
+  $pbot->{commands}->register(sub { return $self->load_module(@_)     },       "load",        90);
+  $pbot->{commands}->register(sub { return $self->unload_module(@_)   },       "unload",      90);
   $pbot->{commands}->register(sub { return $self->histogram(@_)       },       "histogram",    0);
   $pbot->{commands}->register(sub { return $self->count(@_)           },       "count",        0);