diff --git a/lib/Resmon/Module/DHCPLEASES.pm b/lib/Resmon/Module/DHCPLEASES.pm
index 0db8af09da2e4348bcc2e12a87d929530b5cd43b..a23ee10dde6ae108a0af03580708de51f2e4ef40 100755
--- a/lib/Resmon/Module/DHCPLEASES.pm
+++ b/lib/Resmon/Module/DHCPLEASES.pm
@@ -46,9 +46,9 @@ sub handler {
   if ($actives < $warn) {
     return($arg->set_status("OK($actives leases)"));
   }elsif ($actives < $crit) {
-    return($arg->set_status("WARN($actives leases > $warn)"));
+    return($arg->set_status("WARN($actives leases)"));
   }else {
-    return($arg->set_status("BAD($actives leases > $crit!)"));
+    return($arg->set_status("BAD($actives leases)"));
   }
 };
 1;
diff --git a/lib/Resmon/Module/DISK.pm b/lib/Resmon/Module/DISK.pm
index a443e7775b44e88aaa1537105e11acd1cfc3fd18..4ac690eebe3241c5b78e026cb242c9939d9f8b1a 100644
--- a/lib/Resmon/Module/DISK.pm
+++ b/lib/Resmon/Module/DISK.pm
@@ -21,6 +21,6 @@ sub handler {
     }
     return $arg->set_status("OK($1% full)");
   }
-  return $arg->set_status("BAD(no data)");
+  return $arg->set_status("BAD(0 -- no data)");
 }
 1;
diff --git a/lib/Resmon/Module/FILEAGE.pm b/lib/Resmon/Module/FILEAGE.pm
index 7ec6c22fa4d45a503b6e34aa31c26d7a0b53f571..2e0a766906a0a7f3362bc0f222535f38c2af5446 100644
--- a/lib/Resmon/Module/FILEAGE.pm
+++ b/lib/Resmon/Module/FILEAGE.pm
@@ -9,10 +9,10 @@ sub handler {
   my $file = $arg->{'object'};
   my @statinfo = stat($file);
   my $age = time() - $statinfo[9];
-  return $arg->set_status("BAD(too old $age seconds)")
+  return $arg->set_status("BAD($age seconds, too old)")
         if($arg->{maximum} && ($age > $arg->{maximum}));
-  return $arg->set_status("BAD(too new $age seconds)")
+  return $arg->set_status("BAD($age seconds, too new)")
         if($arg->{minimum} && ($age > $arg->{minimum}));
-  return $arg->set_status("OK($age)");
+  return $arg->set_status("OK($age seconds)");
 }
 1;
diff --git a/lib/Resmon/Module/FILESIZE.pm b/lib/Resmon/Module/FILESIZE.pm
index d279b947a9af052a5c42afce30bf5f03d093c758..72fea86b6d4ee1883eb97ab160970617a8ffce44 100644
--- a/lib/Resmon/Module/FILESIZE.pm
+++ b/lib/Resmon/Module/FILESIZE.pm
@@ -11,9 +11,9 @@ sub handler {
   my $size = $statinfo[7];
   my $minsize = $arg->{minimum};
   my $maxsize = $arg->{maximum};
-  return $arg->set_status("BAD(too big, $size > $maxsize)")
+  return $arg->set_status("BAD($size, too big)")
         if($maxsize && ($size > $maxsize));
-  return $arg->set_status("BAD(too small, $size < $minsize)")
+  return $arg->set_status("BAD($size, too small)")
         if($minsize && ($size > $minsize));
   return $arg->set_status("OK($size)");
 }
diff --git a/lib/Resmon/Module/OLDFILES.pm b/lib/Resmon/Module/OLDFILES.pm
index c385d8cb7115c0c55fd2c5724747683a22ab6065..cd42e082d208424e9f453066f6588f906fbcb77b 100644
--- a/lib/Resmon/Module/OLDFILES.pm
+++ b/lib/Resmon/Module/OLDFILES.pm
@@ -32,7 +32,7 @@ sub handler {
         my $output = cache_command("df -k", 600);
         my ($line) = grep(/$dir\s*/, split(/\n/, $output));
         if($line !~ /(\d+)%/) {
-            return "BAD", "dir not mounted";
+            return "BAD", "0 dir not mounted";
         }
     }
 
@@ -40,9 +40,9 @@ sub handler {
     my $output = cache_command("find $dir -type f -mmin +$minutes | wc -l", 600);
     chomp($output);
     if ($output <= $filecount) {
-        return "OK", "$output files over $minutes minutes";
+        return "OK", "$output files";
     } else {
-        return "BAD", "$output files over $minutes minutes";
+        return "BAD", "$output files";
     }
 }
 
diff --git a/lib/Resmon/Module/QUEUESIZE.pm b/lib/Resmon/Module/QUEUESIZE.pm
index 207968d3dd0df92b755f80918a57a9ea8829cb2d..ee6fac38e4b60f8cad47262cd1ce6ea8ab5bce05 100644
--- a/lib/Resmon/Module/QUEUESIZE.pm
+++ b/lib/Resmon/Module/QUEUESIZE.pm
@@ -31,12 +31,12 @@ sub handler {
         $total = $lines[$numLines];
         if( $total =~ /\s*$queue Queue:\s*(\d+).*/ ) {
             if( $1 > $threshold ) {
-                return "BAD", "$1 Messages $queue";
+                return "BAD", "$1 messages";
             } else {
-                return "OK", "$1 Messages $queue";
+                return "OK", "$1 messages";
             }
         } else {
-            return "OK", "no messages for domain";
+            return "OK", "0";
         }
     } else {
         my $rawOutput = cache_command(
diff --git a/lib/Resmon/Module/REMOTEFILESIZE.pm b/lib/Resmon/Module/REMOTEFILESIZE.pm
index 7ad85aa2047df2ee874a9e0de534ee729d2f67dd..d4021f2345a6f22ad7946dbbe557e7419ab2f332 100644
--- a/lib/Resmon/Module/REMOTEFILESIZE.pm
+++ b/lib/Resmon/Module/REMOTEFILESIZE.pm
@@ -14,9 +14,9 @@ sub handler {
   my $size = $1;
   my $minsize = $arg->{minimum};
   my $maxsize = $arg->{maximum};
-  return $arg->set_status("BAD(too big, $size > $maxsize)")
+  return $arg->set_status("BAD($size, too big)")
         if($maxsize && ($size > $maxsize));
-  return $arg->set_status("BAD(too small, $size < $minsize)")
+  return $arg->set_status("BAD($size, too small)")
         if($minsize && ($size > $minsize));
   return $arg->set_status("OK($size)");
 }
diff --git a/lib/Resmon/Module/SIMPLESVN.pm b/lib/Resmon/Module/SIMPLESVN.pm
index 5ebccc9c1ba4d68f6af6de806a8f9ea41283ce80..8d891090a8999bc5e917479eeeae4aa5313fadc0 100644
--- a/lib/Resmon/Module/SIMPLESVN.pm
+++ b/lib/Resmon/Module/SIMPLESVN.pm
@@ -26,7 +26,7 @@ sub handler {
     if($lines[-1] =~ /^Status against revision:\s+(\d+)/) {
       $revision = $1;
     }
-    return $status, "rev:$revision";
+    return $status, "$revision";
 }
 
 1;
diff --git a/lib/Resmon/Module/WALCHECK.pm b/lib/Resmon/Module/WALCHECK.pm
index e41ab8e7fafeb683ad506ceda3e85a99cded7798..3a7669c007ce8a057dfcd55377968fc85e275f0d 100644
--- a/lib/Resmon/Module/WALCHECK.pm
+++ b/lib/Resmon/Module/WALCHECK.pm
@@ -54,14 +54,14 @@ sub handler {
   my @nn = localtime($now);
   my $lnow = timegm(@nn);
 
-  my $diff =  $proc - $lnow;
-  my @tsplit = splittime($diff,60,60,24,7);
+  my $diff =  $lnow - $proc;
+  my @tsplit = splittime((0 - $diff),60,60,24,7);
 
-  if ($diff < -3600)
+  if ($diff > 3600)
   {
-        return $arg->set_status( "BAD(pitr replay is $tsplit[2] hours, $tsplit[1] minutes behind)");
+        return $arg->set_status( "BAD($diff seconds behind)");
   } else {
-        return $arg->set_status( "OK(pitr replay is $tsplit[2] hours, $tsplit[1] minutes behind)");
+        return $arg->set_status( "OK($diff seconds behind)");
   }
 }
 1;
diff --git a/lib/Resmon/Module/ZPOOLFREE.pm b/lib/Resmon/Module/ZPOOLFREE.pm
index 37cc159977c353f20fab3ba48a89b95f48a9ee97..cbdb4980b4f307f145f236a30fafc05eda59f358 100755
--- a/lib/Resmon/Module/ZPOOLFREE.pm
+++ b/lib/Resmon/Module/ZPOOLFREE.pm
@@ -30,7 +30,7 @@ sub handler {
     }
     return "OK", "$1% full";
   }
-  return "BAD", "no data";
+  return "BAD", "0 no data";
 }
 
 1;