diff --git a/discovery.php b/discovery.php
index 3fc8d57631..938d7c5284 100755
--- a/discovery.php
+++ b/discovery.php
@@ -167,13 +167,12 @@ while ($device = mysql_fetch_assoc($device_query))
 
   #include("includes/discovery/os.inc.php");
 
-  if($options['m'])
+  if ($options['m'])
   {
-    if(is_file("includes/discovery/".$options['m'].".inc.php"))
+    if (is_file("includes/discovery/".$options['m'].".inc.php"))
     {
       include("includes/discovery/".$options['m'].".inc.php");
     }
-
   } else {
     include("includes/discovery/ports.inc.php");
     include("includes/discovery/entity-physical.inc.php");
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index d30bbc5188..48f9dba8c5 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -183,7 +183,7 @@ $config['device_traffic_descr']   = array('/loopback/','/vlan/','/tunnel/','/:\d
 
 $config['allow_unauth_graphs']	  = 0; ## Allow graphs to be viewed by anyone
 $config['allow_unauth_graphs_cidr'] = array(); # Allow graphs to be viewed without authorisation from certain IP ranges
-$config['auth_mechanism']         = "mysql";   # Auth Type.
+$config['auth_mechanism']         = "mysql";   # Available mechanisms: mysql (default), ldap, http-auth
 
 ### Sensors
 
diff --git a/poller.php b/poller.php
index ddbb8fad9a..46ec62bfbf 100755
--- a/poller.php
+++ b/poller.php
@@ -52,7 +52,9 @@ if (!$where)
   echo("-h all                                       Poll all devices\n\n");
   echo("-i <instances> -n <number>                   Poll as instance <number> of <instances>\n");
   echo("                                             Instances start at 0. 0-3 for -n 4\n\n");
-  echo("-d                                           Enable some debugging output\n");
+  echo("Debugging and testing options:\n");
+  echo("-d                                           Enable debugging output\n");
+  echo("-m                                           Specify single module to be run\n");
   echo("\n");
   echo("No polling type specified!\n");
   exit;
@@ -212,32 +214,40 @@ while ($device = mysql_fetch_assoc($device_query))
     $sysLocation = str_replace("\"","", $sysLocation);
     $sysContact  = str_replace("\"","", $sysContact);
 
-    include("includes/polling/ipmi.inc.php");
-    include("includes/polling/temperatures.inc.php");
-    include("includes/polling/humidity.inc.php");
-    include("includes/polling/fanspeeds.inc.php");
-    include("includes/polling/voltages.inc.php");
-    include("includes/polling/frequencies.inc.php");
-    include("includes/polling/current.inc.php");
-    include("includes/polling/processors.inc.php");
-    include("includes/polling/mempools.inc.php");
-    include("includes/polling/storage.inc.php");
-    include("includes/polling/netstats.inc.php");
-    include("includes/polling/hr-mib.inc.php");
-    include("includes/polling/ucd-mib.inc.php");
-    include("includes/polling/ipSystemStats.inc.php");
-    include("includes/polling/ports.inc.php");
-    include("includes/polling/cisco-mac-accounting.inc.php");
-    include("includes/polling/bgp-peers.inc.php");
-    include("includes/polling/junose-atm-vp.inc.php");
-    include("includes/polling/toner.inc.php");
-    include("includes/polling/ucd-diskio.inc.php");
-    include("includes/polling/applications.inc.php");
-    include("includes/polling/wifi.inc.php");
+    if ($options['m'])
+    {
+      if (is_file("includes/polling/".$options['m'].".inc.php"))
+      {
+        include("includes/polling/".$options['m'].".inc.php");
+      }
+    } else {
+      include("includes/polling/ipmi.inc.php");
+      include("includes/polling/temperatures.inc.php");
+      include("includes/polling/humidity.inc.php");
+      include("includes/polling/fanspeeds.inc.php");
+      include("includes/polling/voltages.inc.php");
+      include("includes/polling/frequencies.inc.php");
+      include("includes/polling/current.inc.php");
+      include("includes/polling/processors.inc.php");
+      include("includes/polling/mempools.inc.php");
+      include("includes/polling/storage.inc.php");
+      include("includes/polling/netstats.inc.php");
+      include("includes/polling/hr-mib.inc.php");
+      include("includes/polling/ucd-mib.inc.php");
+      include("includes/polling/ipSystemStats.inc.php");
+      include("includes/polling/ports.inc.php");
+      include("includes/polling/cisco-mac-accounting.inc.php");
+      include("includes/polling/bgp-peers.inc.php");
+      include("includes/polling/junose-atm-vp.inc.php");
+      include("includes/polling/toner.inc.php");
+      include("includes/polling/ucd-diskio.inc.php");
+      include("includes/polling/applications.inc.php");
+      include("includes/polling/wifi.inc.php");
 
-    #include("includes/polling/altiga-ssl.inc.php");
-    include("includes/polling/cisco-ipsec-flow-monitor.inc.php");
-    include("includes/polling/cisco-remote-access-monitor.inc.php");
+      #include("includes/polling/altiga-ssl.inc.php");
+      include("includes/polling/cisco-ipsec-flow-monitor.inc.php");
+      include("includes/polling/cisco-remote-access-monitor.inc.php");
+    }
     include("includes/polling/cisco-cef.inc.php");
 
     unset($update);