diff --git a/code_igniter/application/config/config.php b/code_igniter/application/config/config.php
index 0fcb85771..45fe5d76f 100644
--- a/code_igniter/application/config/config.php
+++ b/code_igniter/application/config/config.php
@@ -2,8 +2,8 @@
 if (! defined('BASEPATH')) {
     exit('No direct script access allowed');
 }
-$config['web_internal_version'] = '20170919';
-$config['web_display_version'] = '2.0.8';
+$config['web_internal_version'] = '20171010';
+$config['web_display_version'] = '2.0.10';
 # $config['debug'] = false;
 /*
 |--------------------------------------------------------------------------
diff --git a/code_igniter/application/controllers/agents.php b/code_igniter/application/controllers/agents.php
index a0bb334ae..f833aacf2 100644
--- a/code_igniter/application/controllers/agents.php
+++ b/code_igniter/application/controllers/agents.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
diff --git a/code_igniter/application/controllers/attributes.php b/code_igniter/application/controllers/attributes.php
index 0f3473f72..ab8effc5b 100644
--- a/code_igniter/application/controllers/attributes.php
+++ b/code_igniter/application/controllers/attributes.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
diff --git a/code_igniter/application/controllers/charts.php b/code_igniter/application/controllers/charts.php
index 51763adfe..15022edc8 100644
--- a/code_igniter/application/controllers/charts.php
+++ b/code_igniter/application/controllers/charts.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
diff --git a/code_igniter/application/controllers/collectors.php b/code_igniter/application/controllers/collectors.php
index 7db2a0cc0..09c99f5cf 100644
--- a/code_igniter/application/controllers/collectors.php
+++ b/code_igniter/application/controllers/collectors.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
diff --git a/code_igniter/application/controllers/configuration.php b/code_igniter/application/controllers/configuration.php
index 203015a67..dcf8caff9 100644
--- a/code_igniter/application/controllers/configuration.php
+++ b/code_igniter/application/controllers/configuration.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
diff --git a/code_igniter/application/controllers/connections.php b/code_igniter/application/controllers/connections.php
index 5ab75903d..9f81ca21d 100644
--- a/code_igniter/application/controllers/connections.php
+++ b/code_igniter/application/controllers/connections.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
diff --git a/code_igniter/application/controllers/credentials.php b/code_igniter/application/controllers/credentials.php
index 279a64433..ad0abb93e 100644
--- a/code_igniter/application/controllers/credentials.php
+++ b/code_igniter/application/controllers/credentials.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
diff --git a/code_igniter/application/controllers/custom.php b/code_igniter/application/controllers/custom.php
index 78dc15979..ac4d1c257 100644
--- a/code_igniter/application/controllers/custom.php
+++ b/code_igniter/application/controllers/custom.php
@@ -29,7 +29,7 @@
  * @author Mark Unwin <marku@opmantek.com>
  *
  *
- * @version   2.0.8
+ * @version   2.0.10
  *
  * @copyright Copyright (c) 2014, Opmantek
  * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
diff --git a/code_igniter/application/controllers/database.php b/code_igniter/application/controllers/database.php
index d53a4c495..2f757efb3 100644
--- a/code_igniter/application/controllers/database.php
+++ b/code_igniter/application/controllers/database.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
@@ -677,6 +677,11 @@ public function update()
             include "db_upgrades/db_2.0.8.php";
         }
 
+        if (($db_internal_version < '20171010') and ($this->db->platform() == 'mysql')) {
+            # upgrade for 2.0.10
+            include "db_upgrades/db_2.0.10.php";
+        }
+
         $this->data['include'] = 'v_database_update';
         $this->data['heading'] = 'Database Upgrade';
         $this->data['success'] = "Database upgraded successfully. New database version is ".$this->config->config['display_version']." (".$this->config->config['internal_version'].")";
diff --git a/code_igniter/application/controllers/db_upgrades/db_2.0.10.php b/code_igniter/application/controllers/db_upgrades/db_2.0.10.php
new file mode 100644
index 000000000..1a1e2bedb
--- /dev/null
+++ b/code_igniter/application/controllers/db_upgrades/db_2.0.10.php
@@ -0,0 +1,73 @@
+<?php
+/**
+#  Copyright 2003-2015 Opmantek Limited (www.opmantek.com)
+#
+#  ALL CODE MODIFICATIONS MUST BE SENT TO CODE@OPMANTEK.COM
+#
+#  This file is part of Open-AudIT.
+#
+#  Open-AudIT is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU Affero General Public License as published
+#  by the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  Open-AudIT is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU Affero General Public License for more details.
+#
+#  You should have received a copy of the GNU Affero General Public License
+#  along with Open-AudIT (most likely in a file named LICENSE).
+#  If not, see <http://www.gnu.org/licenses/>
+#
+#  For further information on Open-AudIT or for a license other than AGPL please see
+#  www.opmantek.com or email contact@opmantek.com
+#
+# *****************************************************************************
+*
+**/
+
+$this->log_db('Upgrade database to 2.0.10 commenced');
+
+$sql = "DELETE FROM `configuration` WHERE name = 'discovery_linux_use_sudo'";
+$this->db->query($sql);
+$this->log_db($this->db->last_query());
+
+$sql = "INSERT INTO `configuration` VALUES (NULL,'discovery_linux_use_sudo','y','bool','y','system','2000-01-01 00:00:00','When running discovery commands on a Linux target, should we use sudo.')";
+$this->db->query($sql);
+$this->log_db($this->db->last_query());
+
+$sql = "DELETE FROM `configuration` WHERE name = 'delete_noncurrent_netstat'";
+$this->db->query($sql);
+$this->log_db($this->db->last_query());
+
+$sql = "INSERT INTO `configuration` VALUES (NULL,'delete_noncurrent_netstat','y','bool','y','system','2000-01-01 00:00:00','Should we store non-current netstat data and generate change logs.')";
+$this->db->query($sql);
+$this->log_db($this->db->last_query());
+
+$sql = "DELETE FROM `configuration` WHERE name = 'delete_noncurrent_variable'";
+$this->db->query($sql);
+$this->log_db($this->db->last_query());
+
+$sql = "INSERT INTO `configuration` VALUES (NULL,'delete_noncurrent_variable','y','bool','y','system','2000-01-01 00:00:00','Should we store non-current environment variable data and generate change logs.')";
+$this->db->query($sql);
+$this->log_db($this->db->last_query());
+
+# fields
+alter_table('fields', 'type', "`type` enum('varchar','list','date') NOT NULL DEFAULT 'varchar'");
+
+# ldap_servers
+alter_table('ldap_servers', 'port', "`port` varchar(200) NOT NULL DEFAULT '389'");
+
+# set our versions
+$sql = "UPDATE `configuration` SET `value` = '20171010' WHERE `name` = 'internal_version'";
+$this->db->query($sql);
+$this->log_db($this->db->last_query());
+
+$sql = "UPDATE `configuration` SET `value` = '2.0.10' WHERE `name` = 'display_version'";
+$this->db->query($sql);
+$this->log_db($this->db->last_query());
+
+$this->log_db("Upgrade database to 2.0.10 completed");
+$this->config->config['internal_version'] = '20171010';
+$this->config->config['display_version'] = '2.0.10';
diff --git a/code_igniter/application/controllers/devices.php b/code_igniter/application/controllers/devices.php
index 30c77f3f1..69775a0fe 100644
--- a/code_igniter/application/controllers/devices.php
+++ b/code_igniter/application/controllers/devices.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
@@ -191,6 +191,28 @@ private function create()
             $device->last_seen = $this->config->config['timestamp'];
             $this->load->model('m_devices');
             $id = $this->m_devices->create($device);
+            $device->id = $id;
+            if (!empty($device->ip) and !empty($device->netmask)) {
+                $this->load->helper('network');
+                $network = network_details($device->ip . ' ' . $device->netmask);
+                if (empty($network->error)) {
+                    $this->load->model('m_devices_components');
+                    $device_ip = new stdClass();
+                    $device_ip->mac = '';
+                    $device_ip->net_index = '';
+                    $device_ip->ip = $network->address;
+                    $device_ip->netmask = $network->netmask;
+                    $device_ip->cidr = $network->network_slash;
+                    $device_ip->version = 4;
+                    $device_ip->network = $network->network . '/' . $network->network_slash;
+                    $device_ip->set_by = '';
+                    $input = new stdClass();
+                    $input->item = array();
+                    $input->item[] = $device_ip;
+                    $error = $this->m_devices_components->process_component('ip', $device, $input);
+                }
+            }
+
             if ($this->response->meta->format == 'screen') {
                 redirect('devices/' . $id);
             } else {
diff --git a/code_igniter/application/controllers/discoveries.php b/code_igniter/application/controllers/discoveries.php
index 093ce095b..8151dd192 100644
--- a/code_igniter/application/controllers/discoveries.php
+++ b/code_igniter/application/controllers/discoveries.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
diff --git a/code_igniter/application/controllers/discovery.php b/code_igniter/application/controllers/discovery.php
index 7c5cfdbfe..b108bc8c0 100644
--- a/code_igniter/application/controllers/discovery.php
+++ b/code_igniter/application/controllers/discovery.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
diff --git a/code_igniter/application/controllers/errors.php b/code_igniter/application/controllers/errors.php
index 323b42d1b..0f1f86e52 100644
--- a/code_igniter/application/controllers/errors.php
+++ b/code_igniter/application/controllers/errors.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
diff --git a/code_igniter/application/controllers/fields.php b/code_igniter/application/controllers/fields.php
index a6a00cd75..6e3cae259 100644
--- a/code_igniter/application/controllers/fields.php
+++ b/code_igniter/application/controllers/fields.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
diff --git a/code_igniter/application/controllers/files.php b/code_igniter/application/controllers/files.php
index d23c72594..182ba7891 100644
--- a/code_igniter/application/controllers/files.php
+++ b/code_igniter/application/controllers/files.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
diff --git a/code_igniter/application/controllers/groups.php b/code_igniter/application/controllers/groups.php
index 4e7e7c6db..84211c03f 100644
--- a/code_igniter/application/controllers/groups.php
+++ b/code_igniter/application/controllers/groups.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
diff --git a/code_igniter/application/controllers/help.php b/code_igniter/application/controllers/help.php
index 4729f9d60..eab535a96 100644
--- a/code_igniter/application/controllers/help.php
+++ b/code_igniter/application/controllers/help.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
diff --git a/code_igniter/application/controllers/home.php b/code_igniter/application/controllers/home.php
index 177b62fd1..97621cbf8 100644
--- a/code_igniter/application/controllers/home.php
+++ b/code_igniter/application/controllers/home.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
diff --git a/code_igniter/application/controllers/include_input_devices.php b/code_igniter/application/controllers/include_input_devices.php
index 51deb8224..2c9b9d417 100644
--- a/code_igniter/application/controllers/include_input_devices.php
+++ b/code_igniter/application/controllers/include_input_devices.php
@@ -187,7 +187,6 @@
 }
 
 $details = $json->system;
-$ids[] = discovery_log($log);
 $json->system->mac_addresses = array();
 if (!empty($json->network->item) and count($json->network->item) > 0) {
     foreach ($json->network->item as $card) {
@@ -203,6 +202,22 @@
 
 $received_system_id = '';
 $received_status = "";
+
+if (empty($details->id) and empty($details->ip) and empty($details->hostname)) {
+    $sql = "DELETE FROM discovery_log WHERE id IN (" . implode(',', $ids) . ")";
+    $query = $this->db->query($sql);
+    $log->summary = "Invalid audit result submitted";
+    $log->detail = "Audit result submitted, but no device id, ip or name received from " . $_SERVER['REMOTE_ADDR'] . " - NOT inserting or updating.";
+    $log->type = 'system';
+    $log->collection = 'input';
+    $log->action = 'create';
+    $log->function = 'devices';
+    $log->function = 'fail';
+    $log->severity = 3;
+    stdlog($log);
+    exit;
+}
+
 if (empty($details->id)) {
     $details->id = '';
     $log->message = "No system_id provided.";
@@ -308,9 +323,6 @@
     $sql = "/* include_input_device */" . " DELETE FROM `discovery_log` WHERE `system_id` = ? AND `command` = 'process audit' AND pid != ?";
     $data = array(intval($details->id), intval(getmypid()));
     $query = $this->db->query($sql, $data);
-    // if ($this->response->meta->format == 'screen') {
-    //     echo $this->db->last_query();
-    // }
 } else {
     # we were supplied an audit result, but no discovery_id
     # delete all dicovery logs where system_id = our ID and log.pid != our pid
@@ -325,7 +337,7 @@
 
 foreach ($json as $key => $value) {
     if ($key != 'system' and $key != 'audit_wmi_fail' and $key != 'dns') {
-        if (!empty($json->{$key}->item)) {
+        if (!empty($json->{$key}->item) or $key == 'netstat') {
             $this->m_devices_components->process_component($key, $details, $json->{$key});
         }
     }
diff --git a/code_igniter/application/controllers/include_input_discoveries.php b/code_igniter/application/controllers/include_input_discoveries.php
index b02f87163..2a5577e57 100644
--- a/code_igniter/application/controllers/include_input_discoveries.php
+++ b/code_igniter/application/controllers/include_input_discoveries.php
@@ -1042,7 +1042,7 @@
                     break;
                 
                 case 'vmkernel':
-                case 'vmware' :
+                case 'vmware':
                     $audit_script = 'audit_esxi.sh';
                     break;
                 
@@ -1135,7 +1135,7 @@
                 $unlink = '';
                 $source_name = $audit_script;
                 $log->message = 'Could not retrieve script from database for ' . $device->os_group;
-                $log->command = 'Nothing returned from database';
+                $log->command = $sql;
                 $log->status = 'fail';
                 discovery_log($log);
                 unset($log->command, $log->message, $log->status);
@@ -1184,16 +1184,17 @@
 
             # audit anything that's not ESX
             if ($audit_script != 'audit_esxi.sh' and $audit_script != '') {
-                # successfully copied and chmodded the audit script
-                // if (!empty($credentials_ssh->sudo)) {
-                //     # run the audit script as a normal user, using sudo
-                //     $command = 'echo "'.$credentials_ssh->credentials->password.'" | '.$credentials_ssh->sudo.' -S '.$this->config->item('discovery_linux_script_directory').$audit_script.' submit_online=y create_file=n url='.$discovery->network_address.'index.php/input/devices debugging='.$debugging.' system_id='.$device->id.' display=' . $display . ' last_seen_by=audit_ssh discovery_id='.$discovery->id;
-                // } else {
-                //     # run the script without using sudo
-                //     $command = $this->config->item('discovery_linux_script_directory').$audit_script.' submit_online=y create_file=n url='.$discovery->network_address.'index.php/input/devices debugging='.$debugging.' system_id='.$device->id.' display=' . $display . ' last_seen_by=audit_ssh discovery_id='.$discovery->id;
-                // }
                 $command = $this->config->item('discovery_linux_script_directory').$audit_script.' submit_online=y create_file=n url='.$discovery->network_address.'index.php/input/devices debugging='.$debugging.' system_id='.$device->id.' display=' . $display . ' last_seen_by=audit_ssh discovery_id='.$discovery->id;
-                $result = ssh_command($device->ip, $credentials_ssh, $command, $log, 'y');
+                if (!empty($this->config->item('discovery_linux_use_sudo')) and
+                    $this->config->item('discovery_linux_use_sudo') !== 'y' and
+                    strtolower($device->os_group) == 'linux') {
+                    # Running linux audit without sudo
+                    $log->message = 'Running Linux audit without sudo, as per config.';
+                    discovery_log($log);
+                    $result = ssh_command($device->ip, $credentials_ssh, $command, $log, 'n');
+                } else {
+                    $result = ssh_command($device->ip, $credentials_ssh, $command, $log, 'y');
+                }
             }
             # audit ESX
             # TODO - Cannot copy audit_esxi.sh - more work required to fix
@@ -1282,7 +1283,6 @@
                             unset($log->command, $log->message, $log->status);
                             $log->severity = 7;
                         }
-
                     }
                 }
             }
@@ -1301,7 +1301,6 @@
                 unset($log->command, $log->message, $log->status);
                 $log->severity = 7;
             }
-
         } // close the 'skip'
         #if ($audit_script != '') {
         #    $log->message = "Discovery has completed processing $device->ip (System ID $device->id) but an audit script result may be incoming.";
diff --git a/code_igniter/application/controllers/include_scripts_options.php b/code_igniter/application/controllers/include_scripts_options.php
index 1ca338bce..6ed3eeb59 100644
--- a/code_igniter/application/controllers/include_scripts_options.php
+++ b/code_igniter/application/controllers/include_scripts_options.php
@@ -29,7 +29,7 @@
      * @author Mark Unwin <marku@opmantek.com>
      *
      *
-     * @version   2.0.8
+     * @version   2.0.10
 
      * @copyright Copyright (c) 2014, Opmantek
      * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
diff --git a/code_igniter/application/controllers/include_update.php b/code_igniter/application/controllers/include_update.php
index c3008a31d..2a1a2262a 100644
--- a/code_igniter/application/controllers/include_update.php
+++ b/code_igniter/application/controllers/include_update.php
@@ -26,9 +26,9 @@
 # *****************************************************************************
 
 if (empty($this->response->meta->received_data)) {
-	log_error('ERR-0025');
-	output($this->response);
-	exit();
+    log_error('ERR-0025');
+    output($this->response);
+    exit();
 }
 $this->load->model('m_collection');
 $this->{'m_collection'}->update();
@@ -42,7 +42,7 @@
 
 $log = new stdClass();
 $log->object = $this->response->meta->collection;
-$log->function = strtolower($this->response->meta->collection) . '::' . strtolower($this->response->meta->action); 
+$log->function = strtolower($this->response->meta->collection) . '::' . strtolower($this->response->meta->action);
 $log->severity = 7;
 $log->status = 'finish';
 $log->type = 'access';
diff --git a/code_igniter/application/controllers/input.php b/code_igniter/application/controllers/input.php
index fa04e3c35..1358de073 100644
--- a/code_igniter/application/controllers/input.php
+++ b/code_igniter/application/controllers/input.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
@@ -81,6 +81,20 @@ public function __construct()
         }
 
         if (!$this->m_networks->check_ip($_SERVER['REMOTE_ADDR'], '')) {
+            $log->severity = 3;
+            $log->summary = 'Unauthorized';
+            $log->message = 'Unauthorized XML input for ' . $this->uri->segment(2, 0) . ' from ' . $_SERVER['REMOTE_ADDR'] . '. Not in list of blessed subnets.';
+            if ($this->uri->segment(2, 0) == 'discoveries') {
+                if (!empty($_POST['data'])) {
+                    $xml_input = $_POST['data'];
+                    $xml = new SimpleXMLElement($xml_input);
+                    if (!empty($xml->device->discovery_id)) {
+                        $log->message = 'Unauthorized XML input for discoveries from ' . $_SERVER['REMOTE_ADDR'] . ' for discovery #' . intval($xml->device->discovery_id) . '. Not in list of blessed subnets.';
+                        discovery_log($log);
+                    }
+                }
+            }
+            stdlog($syslog);
             exit;
         }
 
@@ -104,6 +118,7 @@ public function __construct()
     */
     public function index()
     {
+        # Unused
     }
 
     /**
@@ -126,7 +141,7 @@ public function _remap()
             $this->roles = $this->m_roles->collection();
             $this->response->meta->collection = 'input';
             $this->response->data = array();
-            $this->response->meta->id = NULL;
+            $this->response->meta->id = null;
             $this->response->meta->action = $this->uri->segment(2, 0) . '_create_form';
             $this->response->meta->total = 0;
             $this->response->meta->format = 'screen';
@@ -162,7 +177,7 @@ public function devices()
         $log->function = strtolower($log->collection) . '::' . strtolower($log->action);
         $log->summary = 'processing submitted data';
         stdlog($log);
-        $discovery_id = NULL;
+        $discovery_id = null;
         include "include_input_devices.php";
     }
 
diff --git a/code_igniter/application/controllers/ldap_servers.php b/code_igniter/application/controllers/ldap_servers.php
index 76713b810..28305b8d0 100644
--- a/code_igniter/application/controllers/ldap_servers.php
+++ b/code_igniter/application/controllers/ldap_servers.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
diff --git a/code_igniter/application/controllers/licenses.php b/code_igniter/application/controllers/licenses.php
index 4e7d56cd5..e33e7883f 100644
--- a/code_igniter/application/controllers/licenses.php
+++ b/code_igniter/application/controllers/licenses.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
diff --git a/code_igniter/application/controllers/locations.php b/code_igniter/application/controllers/locations.php
index 538bbf183..0da54f523 100644
--- a/code_igniter/application/controllers/locations.php
+++ b/code_igniter/application/controllers/locations.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
diff --git a/code_igniter/application/controllers/logon.php b/code_igniter/application/controllers/logon.php
index 1ee30816b..97935860d 100644
--- a/code_igniter/application/controllers/logon.php
+++ b/code_igniter/application/controllers/logon.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
@@ -204,7 +204,7 @@ public function login()
             exit();
         }
 
-        if ($this->user->type == 'collector') {
+        if (!empty($this->user->type) and $this->user->type == 'collector') {
             // if (@$this->input->post('uuid') == '') {
             //     log_error('ERR-0030', current_url());
             //     header($this->response->meta->header);
diff --git a/code_igniter/application/controllers/logs.php b/code_igniter/application/controllers/logs.php
index 7f8be5da9..7bf34647c 100644
--- a/code_igniter/application/controllers/logs.php
+++ b/code_igniter/application/controllers/logs.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
diff --git a/code_igniter/application/controllers/main.php b/code_igniter/application/controllers/main.php
index f238cd248..6b928476f 100644
--- a/code_igniter/application/controllers/main.php
+++ b/code_igniter/application/controllers/main.php
@@ -29,7 +29,7 @@
  * @author Mark Unwin <marku@opmantek.com>
  *
  *
- * @version   2.0.8
+ * @version   2.0.10
  *
  * @copyright Copyright (c) 2014, Opmantek
  * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
diff --git a/code_igniter/application/controllers/networks.php b/code_igniter/application/controllers/networks.php
index 7dbae1615..7e7c3383e 100644
--- a/code_igniter/application/controllers/networks.php
+++ b/code_igniter/application/controllers/networks.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
diff --git a/code_igniter/application/controllers/nmis.php b/code_igniter/application/controllers/nmis.php
index 183692196..7d3918eca 100644
--- a/code_igniter/application/controllers/nmis.php
+++ b/code_igniter/application/controllers/nmis.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
diff --git a/code_igniter/application/controllers/orgs.php b/code_igniter/application/controllers/orgs.php
index 273d5e742..e1b241cee 100644
--- a/code_igniter/application/controllers/orgs.php
+++ b/code_igniter/application/controllers/orgs.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
diff --git a/code_igniter/application/controllers/queries.php b/code_igniter/application/controllers/queries.php
index 644e7b554..dddd53fd2 100644
--- a/code_igniter/application/controllers/queries.php
+++ b/code_igniter/application/controllers/queries.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
@@ -89,7 +89,12 @@ public function _remap()
     */
     public function create()
     {
-        if (stripos($this->response->meta->received_data->attributes->sql, 'where @filter') === false or 
+        if (empty($this->response->meta->received_data->attributes->sql)) {
+            log_error('ERR-0010', 'queries::create');
+            echo json_encode($this->response);
+            exit();
+        }
+        if (stripos($this->response->meta->received_data->attributes->sql, 'where @filter') === false or
             stripos($this->response->meta->received_data->attributes->sql, 'where @filter or') !== false) {
             // We don't have the HIGHLY RECOMMENDED @filter in our SQL
             // Ensure the user creating this query has the admin role
@@ -129,7 +134,7 @@ public function read()
     public function update()
     {
         if (!empty($this->response->meta->received_data->attributes->sql) and
-            (stripos($this->response->meta->received_data->attributes->sql, 'where @filter') === false or 
+            (stripos($this->response->meta->received_data->attributes->sql, 'where @filter') === false or
             stripos($this->response->meta->received_data->attributes->sql, 'where @filter or') !== false)) {
             // We don't have the HIGHLY RECOMMENDED @filter in our SQL
             // Ensure the user creating this query has the admin role
@@ -242,7 +247,6 @@ public function reset()
     {
         include 'include_reset.php';
     }
-
 }
 // End of file queries.php
 // Location: ./controllers/queries.php
diff --git a/code_igniter/application/controllers/reports.php b/code_igniter/application/controllers/reports.php
index 46e410958..4cd9ff852 100644
--- a/code_igniter/application/controllers/reports.php
+++ b/code_igniter/application/controllers/reports.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
diff --git a/code_igniter/application/controllers/roles.php b/code_igniter/application/controllers/roles.php
index 3ffdfda23..9864f8115 100644
--- a/code_igniter/application/controllers/roles.php
+++ b/code_igniter/application/controllers/roles.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
diff --git a/code_igniter/application/controllers/san.php b/code_igniter/application/controllers/san.php
index 3b624493d..c1d47eabe 100644
--- a/code_igniter/application/controllers/san.php
+++ b/code_igniter/application/controllers/san.php
@@ -29,7 +29,7 @@
  * @author Mark Unwin <marku@opmantek.com>
  *
  *
- * @version   2.0.8
+ * @version   2.0.10
  *
  * @copyright Copyright (c) 2014, Opmantek
  * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
diff --git a/code_igniter/application/controllers/scripts.php b/code_igniter/application/controllers/scripts.php
index afe62525c..d0ea683ff 100644
--- a/code_igniter/application/controllers/scripts.php
+++ b/code_igniter/application/controllers/scripts.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
diff --git a/code_igniter/application/controllers/search.php b/code_igniter/application/controllers/search.php
index 6ab237eb8..ae0350a89 100644
--- a/code_igniter/application/controllers/search.php
+++ b/code_igniter/application/controllers/search.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
diff --git a/code_igniter/application/controllers/summaries.php b/code_igniter/application/controllers/summaries.php
index 10edde3c8..084e11c29 100644
--- a/code_igniter/application/controllers/summaries.php
+++ b/code_igniter/application/controllers/summaries.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
diff --git a/code_igniter/application/controllers/tasks.php b/code_igniter/application/controllers/tasks.php
index 215264bbf..2a9b79140 100644
--- a/code_igniter/application/controllers/tasks.php
+++ b/code_igniter/application/controllers/tasks.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
diff --git a/code_igniter/application/controllers/test.php b/code_igniter/application/controllers/test.php
index 5c6476492..404b845d8 100644
--- a/code_igniter/application/controllers/test.php
+++ b/code_igniter/application/controllers/test.php
@@ -29,7 +29,7 @@
  * @author Mark Unwin <marku@opmantek.com>
  *
  *
- * @version   2.0.8
+ * @version   2.0.10
 
  *
  * @copyright Copyright (c) 2014, Opmantek
diff --git a/code_igniter/application/controllers/users.php b/code_igniter/application/controllers/users.php
index a30d494d5..cbd44676c 100644
--- a/code_igniter/application/controllers/users.php
+++ b/code_igniter/application/controllers/users.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
diff --git a/code_igniter/application/controllers/util.php b/code_igniter/application/controllers/util.php
index 613b476be..da929f28c 100644
--- a/code_igniter/application/controllers/util.php
+++ b/code_igniter/application/controllers/util.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
 */
 
diff --git a/code_igniter/application/core/MY_Controller.php b/code_igniter/application/core/MY_Controller.php
index 5cb7fd3fb..ad581d68e 100644
--- a/code_igniter/application/core/MY_Controller.php
+++ b/code_igniter/application/core/MY_Controller.php
@@ -31,7 +31,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/core/MY_Input.php b/code_igniter/application/core/MY_Input.php
index 8d7995b83..2073b8bf6 100644
--- a/code_igniter/application/core/MY_Input.php
+++ b/code_igniter/application/core/MY_Input.php
@@ -33,7 +33,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/core/MY_Model.php b/code_igniter/application/core/MY_Model.php
index f84e274ea..5130738da 100644
--- a/code_igniter/application/core/MY_Model.php
+++ b/code_igniter/application/core/MY_Model.php
@@ -31,7 +31,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/error_helper.php b/code_igniter/application/helpers/error_helper.php
index b780a87a0..9a3dc2749 100644
--- a/code_igniter/application/helpers/error_helper.php
+++ b/code_igniter/application/helpers/error_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 if (! function_exists('getError')) {
diff --git a/code_igniter/application/helpers/input_helper.php b/code_igniter/application/helpers/input_helper.php
index 28615cd8e..167a5fc7f 100644
--- a/code_igniter/application/helpers/input_helper.php
+++ b/code_igniter/application/helpers/input_helper.php
@@ -33,7 +33,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 if (! function_exists('from_unix_timestamp')) {
@@ -402,24 +402,35 @@ function inputRead()
 
         # put any POST data into the object
         if ($REQUEST_METHOD == 'POST') {
-            if (is_array($CI->input->post('data'))) {
-                $CI->response->meta->received_data = $CI->input->post('data');
+            #if (is_array($CI->input->post('data'))) {
+            if (!empty($_POST['data']) and is_array($_POST{'data'})) {
+                #$CI->response->meta->received_data = $CI->input->post('data');
+                $CI->response->meta->received_data = $_POST{'data'};
                 $CI->response->meta->received_data = json_encode($CI->response->meta->received_data);
                 $CI->response->meta->received_data = json_decode($CI->response->meta->received_data);
             } else {
-                $CI->response->meta->received_data = json_decode($CI->input->post('data'));
+                $CI->response->meta->received_data = @json_decode($_POST{'data'});
             }
         }
+
         if ($REQUEST_METHOD == 'PATCH') {
-            $data = urldecode(str_replace('data=', '', file_get_contents('php://input')));
-            $data = json_decode($data);
-            if (empty($data)) {
+            unset($data_json);
+            unset($data_object);
+            $data_json = urldecode(str_replace('data=', '', file_get_contents('php://input')));
+            $data_object = json_decode($data_json);
+            $options = $data_object->data->attributes->options;
+            if (empty($data_object)) {
                 $log->summary = 'Request method is PATCH but no data supplied.';
                 stdlog($log);
             } else {
-                $CI->response->meta->received_data = $data->data;
+                $CI->response->meta->received_data = new stdClass();
+                $CI->response->meta->received_data = $data_object->data;
+                if (!empty($options)) {
+                    $CI->response->meta->received_data->attributes->options = $options;
+                }
             }
         }
+
         if (!empty($CI->response->meta->received_data->id)) {
             if ($CI->response->meta->collection != 'database' and $CI->response->meta->collection != 'configuration') {
                 $CI->response->meta->id = intval($CI->response->meta->received_data->id);
@@ -654,7 +665,6 @@ function inputRead()
             $CI->response->meta->current = $CI->input->get('current');
             $log->summary = 'Set current to ' . $CI->response->meta->current . ', according to GET.';
             stdlog($log);
-
         }
         if ($CI->input->post('current')) {
             $CI->response->meta->current = $CI->input->post('current');
diff --git a/code_igniter/application/helpers/ipmi_helper.php b/code_igniter/application/helpers/ipmi_helper.php
index da110a358..defba1191 100644
--- a/code_igniter/application/helpers/ipmi_helper.php
+++ b/code_igniter/application/helpers/ipmi_helper.php
@@ -31,7 +31,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 if (!defined('BASEPATH')) {
diff --git a/code_igniter/application/helpers/log_helper.php b/code_igniter/application/helpers/log_helper.php
index deb273fde..b16b3e7f5 100644
--- a/code_igniter/application/helpers/log_helper.php
+++ b/code_igniter/application/helpers/log_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 if (! function_exists('log_error')) {
diff --git a/code_igniter/application/helpers/mac_helper.php b/code_igniter/application/helpers/mac_helper.php
index 996cd19b1..0f457f7c8 100644
--- a/code_igniter/application/helpers/mac_helper.php
+++ b/code_igniter/application/helpers/mac_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 if (! function_exists('get_manufacturer_from_mac')) {
diff --git a/code_igniter/application/helpers/network_helper.php b/code_igniter/application/helpers/network_helper.php
index c7d3d8e80..456308b39 100644
--- a/code_igniter/application/helpers/network_helper.php
+++ b/code_igniter/application/helpers/network_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/output_helper.php b/code_igniter/application/helpers/output_helper.php
index 20fd9bbaa..d7030d9c9 100644
--- a/code_igniter/application/helpers/output_helper.php
+++ b/code_igniter/application/helpers/output_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 if (! function_exists('output')) {
diff --git a/code_igniter/application/helpers/snmp_10002_helper.php b/code_igniter/application/helpers/snmp_10002_helper.php
index 4b9bc5d46..227156e12 100644
--- a/code_igniter/application/helpers/snmp_10002_helper.php
+++ b/code_igniter/application/helpers/snmp_10002_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_10529_helper.php b/code_igniter/application/helpers/snmp_10529_helper.php
index e5a29a3c4..21324d6ba 100644
--- a/code_igniter/application/helpers/snmp_10529_helper.php
+++ b/code_igniter/application/helpers/snmp_10529_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_1139_helper.php b/code_igniter/application/helpers/snmp_1139_helper.php
index 1b6352a51..938d76b51 100644
--- a/code_igniter/application/helpers/snmp_1139_helper.php
+++ b/code_igniter/application/helpers/snmp_1139_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_114_helper.php b/code_igniter/application/helpers/snmp_114_helper.php
index ba87ac83e..d0326196f 100644
--- a/code_igniter/application/helpers/snmp_114_helper.php
+++ b/code_igniter/application/helpers/snmp_114_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_116_helper.php b/code_igniter/application/helpers/snmp_116_helper.php
index 496858dca..d7022fa52 100644
--- a/code_igniter/application/helpers/snmp_116_helper.php
+++ b/code_igniter/application/helpers/snmp_116_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_11863_helper.php b/code_igniter/application/helpers/snmp_11863_helper.php
index fa167b5b4..8e51bc758 100644
--- a/code_igniter/application/helpers/snmp_11863_helper.php
+++ b/code_igniter/application/helpers/snmp_11863_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_11_helper.php b/code_igniter/application/helpers/snmp_11_helper.php
index 313ff37d2..1698bede0 100644
--- a/code_igniter/application/helpers/snmp_11_helper.php
+++ b/code_igniter/application/helpers/snmp_11_helper.php
@@ -32,7 +32,7 @@
  * @package Open-AudIT
  * @author Mark Unwin <marku@opmantek.com>
  *
- * @version   2.0.8
+ * @version   2.0.10
 
  * @copyright Copyright (c) 2014, Opmantek
  * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
diff --git a/code_igniter/application/helpers/snmp_12124_helper.php b/code_igniter/application/helpers/snmp_12124_helper.php
index e1e14d6c5..4b4b4a608 100644
--- a/code_igniter/application/helpers/snmp_12124_helper.php
+++ b/code_igniter/application/helpers/snmp_12124_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_12140_helper.php b/code_igniter/application/helpers/snmp_12140_helper.php
index 18e2b1d38..68740892f 100644
--- a/code_igniter/application/helpers/snmp_12140_helper.php
+++ b/code_igniter/application/helpers/snmp_12140_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_1230_helper.php b/code_igniter/application/helpers/snmp_1230_helper.php
index 80850efac..1b4dd8e18 100644
--- a/code_igniter/application/helpers/snmp_1230_helper.php
+++ b/code_igniter/application/helpers/snmp_1230_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_12356_helper.php b/code_igniter/application/helpers/snmp_12356_helper.php
index 571a87fca..f4ed1de5e 100644
--- a/code_igniter/application/helpers/snmp_12356_helper.php
+++ b/code_igniter/application/helpers/snmp_12356_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_13742_helper.php b/code_igniter/application/helpers/snmp_13742_helper.php
index b15d7c360..79a32417a 100644
--- a/code_igniter/application/helpers/snmp_13742_helper.php
+++ b/code_igniter/application/helpers/snmp_13742_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_13858_helper.php b/code_igniter/application/helpers/snmp_13858_helper.php
index 5910146fc..1736000e6 100644
--- a/code_igniter/application/helpers/snmp_13858_helper.php
+++ b/code_igniter/application/helpers/snmp_13858_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_14179_helper.php b/code_igniter/application/helpers/snmp_14179_helper.php
index 8ce78dbff..0a2f08944 100644
--- a/code_igniter/application/helpers/snmp_14179_helper.php
+++ b/code_igniter/application/helpers/snmp_14179_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_1429_helper.php b/code_igniter/application/helpers/snmp_1429_helper.php
index 8232e6d68..6b8fbd400 100644
--- a/code_igniter/application/helpers/snmp_1429_helper.php
+++ b/code_igniter/application/helpers/snmp_1429_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_14988_helper.php b/code_igniter/application/helpers/snmp_14988_helper.php
index 19f49c843..c81ca3ca1 100644
--- a/code_igniter/application/helpers/snmp_14988_helper.php
+++ b/code_igniter/application/helpers/snmp_14988_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_1588_helper.php b/code_igniter/application/helpers/snmp_1588_helper.php
index 6bddd3b70..89bf82cb4 100644
--- a/code_igniter/application/helpers/snmp_1588_helper.php
+++ b/code_igniter/application/helpers/snmp_1588_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_1713_helper.php b/code_igniter/application/helpers/snmp_1713_helper.php
index 08832a0d7..c7af6ccde 100644
--- a/code_igniter/application/helpers/snmp_1713_helper.php
+++ b/code_igniter/application/helpers/snmp_1713_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_17163_helper.php b/code_igniter/application/helpers/snmp_17163_helper.php
index 1d2ab3b4f..a6f0f9726 100644
--- a/code_igniter/application/helpers/snmp_17163_helper.php
+++ b/code_igniter/application/helpers/snmp_17163_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_171_helper.php b/code_igniter/application/helpers/snmp_171_helper.php
index 47d4e90d8..2874cadad 100644
--- a/code_igniter/application/helpers/snmp_171_helper.php
+++ b/code_igniter/application/helpers/snmp_171_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_1723_helper.php b/code_igniter/application/helpers/snmp_1723_helper.php
index 763e949cb..459f2d26a 100644
--- a/code_igniter/application/helpers/snmp_1723_helper.php
+++ b/code_igniter/application/helpers/snmp_1723_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_17453_helper.php b/code_igniter/application/helpers/snmp_17453_helper.php
index 445476b7b..5239fd0c2 100644
--- a/code_igniter/application/helpers/snmp_17453_helper.php
+++ b/code_igniter/application/helpers/snmp_17453_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_18334_helper.php b/code_igniter/application/helpers/snmp_18334_helper.php
index 128a045c2..de04a14d1 100644
--- a/code_igniter/application/helpers/snmp_18334_helper.php
+++ b/code_igniter/application/helpers/snmp_18334_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_1896_helper.php b/code_igniter/application/helpers/snmp_1896_helper.php
index 177680ce5..2ed034df4 100644
--- a/code_igniter/application/helpers/snmp_1896_helper.php
+++ b/code_igniter/application/helpers/snmp_1896_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_1916_helper.php b/code_igniter/application/helpers/snmp_1916_helper.php
index a67e54a38..b77157215 100644
--- a/code_igniter/application/helpers/snmp_1916_helper.php
+++ b/code_igniter/application/helpers/snmp_1916_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_19746_helper.php b/code_igniter/application/helpers/snmp_19746_helper.php
index 3e7703aca..7dd71287e 100644
--- a/code_igniter/application/helpers/snmp_19746_helper.php
+++ b/code_igniter/application/helpers/snmp_19746_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_1981_helper.php b/code_igniter/application/helpers/snmp_1981_helper.php
index 7c7fe7074..1bcb4abf9 100644
--- a/code_igniter/application/helpers/snmp_1981_helper.php
+++ b/code_igniter/application/helpers/snmp_1981_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_1991_helper.php b/code_igniter/application/helpers/snmp_1991_helper.php
index f7ed5cb3b..aea2c41f0 100644
--- a/code_igniter/application/helpers/snmp_1991_helper.php
+++ b/code_igniter/application/helpers/snmp_1991_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_1_helper.php b/code_igniter/application/helpers/snmp_1_helper.php
index 87c3cd2f4..7f343ad86 100644
--- a/code_igniter/application/helpers/snmp_1_helper.php
+++ b/code_igniter/application/helpers/snmp_1_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_2011_helper.php b/code_igniter/application/helpers/snmp_2011_helper.php
index b3a356a23..8dd50dbb7 100644
--- a/code_igniter/application/helpers/snmp_2011_helper.php
+++ b/code_igniter/application/helpers/snmp_2011_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_207_helper.php b/code_igniter/application/helpers/snmp_207_helper.php
index cdc29de65..65f963168 100644
--- a/code_igniter/application/helpers/snmp_207_helper.php
+++ b/code_igniter/application/helpers/snmp_207_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_20916_helper.php b/code_igniter/application/helpers/snmp_20916_helper.php
index 45756cc60..0b0d505e5 100644
--- a/code_igniter/application/helpers/snmp_20916_helper.php
+++ b/code_igniter/application/helpers/snmp_20916_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_21671_helper.php b/code_igniter/application/helpers/snmp_21671_helper.php
index 996e2d967..02c772c52 100644
--- a/code_igniter/application/helpers/snmp_21671_helper.php
+++ b/code_igniter/application/helpers/snmp_21671_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_2272_helper.php b/code_igniter/application/helpers/snmp_2272_helper.php
index 7db991b56..c9f8c5aaf 100644
--- a/code_igniter/application/helpers/snmp_2272_helper.php
+++ b/code_igniter/application/helpers/snmp_2272_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_232_helper.php b/code_igniter/application/helpers/snmp_232_helper.php
index db4733dd6..e3c911ef5 100644
--- a/code_igniter/application/helpers/snmp_232_helper.php
+++ b/code_igniter/application/helpers/snmp_232_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_2334_helper.php b/code_igniter/application/helpers/snmp_2334_helper.php
index 7f280c1b6..eb236de16 100644
--- a/code_igniter/application/helpers/snmp_2334_helper.php
+++ b/code_igniter/application/helpers/snmp_2334_helper.php
@@ -32,7 +32,7 @@
  * @package Open-AudIT
  * @author Mark Unwin <marku@opmantek.com>
  *
- * @version   2.0.8
+ * @version   2.0.10
 
  * @copyright Copyright (c) 2014, Opmantek
  * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
diff --git a/code_igniter/application/helpers/snmp_2352_helper.php b/code_igniter/application/helpers/snmp_2352_helper.php
index d5faf9f0a..6893deb00 100644
--- a/code_igniter/application/helpers/snmp_2352_helper.php
+++ b/code_igniter/application/helpers/snmp_2352_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_2435_helper.php b/code_igniter/application/helpers/snmp_2435_helper.php
index 34ae4b1a8..aee777c47 100644
--- a/code_igniter/application/helpers/snmp_2435_helper.php
+++ b/code_igniter/application/helpers/snmp_2435_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_24681_helper.php b/code_igniter/application/helpers/snmp_24681_helper.php
index a91767363..be6972e84 100644
--- a/code_igniter/application/helpers/snmp_24681_helper.php
+++ b/code_igniter/application/helpers/snmp_24681_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_248_helper.php b/code_igniter/application/helpers/snmp_248_helper.php
index d9aace4af..4a9c02436 100644
--- a/code_igniter/application/helpers/snmp_248_helper.php
+++ b/code_igniter/application/helpers/snmp_248_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_25053_helper.php b/code_igniter/application/helpers/snmp_25053_helper.php
index 8cec2d609..fc5a2d361 100644
--- a/code_igniter/application/helpers/snmp_25053_helper.php
+++ b/code_igniter/application/helpers/snmp_25053_helper.php
@@ -32,7 +32,7 @@
  * @package Open-AudIT
  * @author Mark Unwin <marku@opmantek.com>
  *
- * @version   2.0.8
+ * @version   2.0.10
 
  * @copyright Copyright (c) 2014, Opmantek
  * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
diff --git a/code_igniter/application/helpers/snmp_253_helper.php b/code_igniter/application/helpers/snmp_253_helper.php
index be9ffee5b..b78844513 100644
--- a/code_igniter/application/helpers/snmp_253_helper.php
+++ b/code_igniter/application/helpers/snmp_253_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_25461_helper.php b/code_igniter/application/helpers/snmp_25461_helper.php
index 33fd0d00d..f588611d6 100644
--- a/code_igniter/application/helpers/snmp_25461_helper.php
+++ b/code_igniter/application/helpers/snmp_25461_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_25506_helper.php b/code_igniter/application/helpers/snmp_25506_helper.php
index f5ecba439..246aa171f 100644
--- a/code_igniter/application/helpers/snmp_25506_helper.php
+++ b/code_igniter/application/helpers/snmp_25506_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_2620_helper.php b/code_igniter/application/helpers/snmp_2620_helper.php
index 2f3c1834a..96c5d0796 100644
--- a/code_igniter/application/helpers/snmp_2620_helper.php
+++ b/code_igniter/application/helpers/snmp_2620_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_2636_helper.php b/code_igniter/application/helpers/snmp_2636_helper.php
index a13f649a3..91cb3dfe4 100644
--- a/code_igniter/application/helpers/snmp_2636_helper.php
+++ b/code_igniter/application/helpers/snmp_2636_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_2684_helper.php b/code_igniter/application/helpers/snmp_2684_helper.php
index 34d8c24ad..0c253b18b 100644
--- a/code_igniter/application/helpers/snmp_2684_helper.php
+++ b/code_igniter/application/helpers/snmp_2684_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_278_helper.php b/code_igniter/application/helpers/snmp_278_helper.php
index d3dd7ebe1..a22149d9c 100644
--- a/code_igniter/application/helpers/snmp_278_helper.php
+++ b/code_igniter/application/helpers/snmp_278_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_2971_helper.php b/code_igniter/application/helpers/snmp_2971_helper.php
index 785bf58c0..5a6e56f32 100644
--- a/code_igniter/application/helpers/snmp_2971_helper.php
+++ b/code_igniter/application/helpers/snmp_2971_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_297_helper.php b/code_igniter/application/helpers/snmp_297_helper.php
index c014a5200..a99c3329f 100644
--- a/code_igniter/application/helpers/snmp_297_helper.php
+++ b/code_igniter/application/helpers/snmp_297_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_29999_helper.php b/code_igniter/application/helpers/snmp_29999_helper.php
index 111fda8ed..4fdb27709 100644
--- a/code_igniter/application/helpers/snmp_29999_helper.php
+++ b/code_igniter/application/helpers/snmp_29999_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_2_helper.php b/code_igniter/application/helpers/snmp_2_helper.php
index f2d62fd2e..46ce1f675 100644
--- a/code_igniter/application/helpers/snmp_2_helper.php
+++ b/code_igniter/application/helpers/snmp_2_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_3003_helper.php b/code_igniter/application/helpers/snmp_3003_helper.php
index 1462b4cda..eff493193 100644
--- a/code_igniter/application/helpers/snmp_3003_helper.php
+++ b/code_igniter/application/helpers/snmp_3003_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_30065_helper.php b/code_igniter/application/helpers/snmp_30065_helper.php
index 3ed7999e4..91bbc9cfa 100644
--- a/code_igniter/application/helpers/snmp_30065_helper.php
+++ b/code_igniter/application/helpers/snmp_30065_helper.php
@@ -32,7 +32,7 @@
  * @package Open-AudIT
  * @author Mark Unwin <marku@opmantek.com>
  *
- * @version   2.0.8
+ * @version   2.0.10
 
  * @copyright Copyright (c) 2014, Opmantek
  * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
diff --git a/code_igniter/application/helpers/snmp_3097_helper.php b/code_igniter/application/helpers/snmp_3097_helper.php
index b516babe9..c1357bf27 100644
--- a/code_igniter/application/helpers/snmp_3097_helper.php
+++ b/code_igniter/application/helpers/snmp_3097_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_311_helper.php b/code_igniter/application/helpers/snmp_311_helper.php
index 170802c00..b45ccfe84 100644
--- a/code_igniter/application/helpers/snmp_311_helper.php
+++ b/code_igniter/application/helpers/snmp_311_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_318_helper.php b/code_igniter/application/helpers/snmp_318_helper.php
index 1c4047a7f..2b9c3bf63 100644
--- a/code_igniter/application/helpers/snmp_318_helper.php
+++ b/code_igniter/application/helpers/snmp_318_helper.php
@@ -32,7 +32,7 @@
  * @package Open-AudIT
  * @author Mark Unwin <marku@opmantek.com>
  *
- * @version   2.0.8
+ * @version   2.0.10
 
  * @copyright Copyright (c) 2014, Opmantek
  * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
diff --git a/code_igniter/application/helpers/snmp_3224_helper.php b/code_igniter/application/helpers/snmp_3224_helper.php
index 02f8e991e..550c3f0aa 100644
--- a/code_igniter/application/helpers/snmp_3224_helper.php
+++ b/code_igniter/application/helpers/snmp_3224_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_332_helper.php b/code_igniter/application/helpers/snmp_332_helper.php
index 0f2d467b9..0da5f959d 100644
--- a/code_igniter/application/helpers/snmp_332_helper.php
+++ b/code_igniter/application/helpers/snmp_332_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_3347_helper.php b/code_igniter/application/helpers/snmp_3347_helper.php
index 339b06c0b..4717ca955 100644
--- a/code_igniter/application/helpers/snmp_3347_helper.php
+++ b/code_igniter/application/helpers/snmp_3347_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_3375_helper.php b/code_igniter/application/helpers/snmp_3375_helper.php
index 8e6b59993..1b5232c1a 100644
--- a/code_igniter/application/helpers/snmp_3375_helper.php
+++ b/code_igniter/application/helpers/snmp_3375_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_3417_helper.php b/code_igniter/application/helpers/snmp_3417_helper.php
index 132eb9556..863ac8baf 100644
--- a/code_igniter/application/helpers/snmp_3417_helper.php
+++ b/code_igniter/application/helpers/snmp_3417_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_3607_helper.php b/code_igniter/application/helpers/snmp_3607_helper.php
index e061dcd92..3fea936c1 100644
--- a/code_igniter/application/helpers/snmp_3607_helper.php
+++ b/code_igniter/application/helpers/snmp_3607_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_367_helper.php b/code_igniter/application/helpers/snmp_367_helper.php
index 46481fc4d..3ba3ff820 100644
--- a/code_igniter/application/helpers/snmp_367_helper.php
+++ b/code_igniter/application/helpers/snmp_367_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_36_helper.php b/code_igniter/application/helpers/snmp_36_helper.php
index 9dcf9607c..310286a03 100644
--- a/code_igniter/application/helpers/snmp_36_helper.php
+++ b/code_igniter/application/helpers/snmp_36_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_3833_helper.php b/code_igniter/application/helpers/snmp_3833_helper.php
index 0b36a2916..c7678d006 100644
--- a/code_igniter/application/helpers/snmp_3833_helper.php
+++ b/code_igniter/application/helpers/snmp_3833_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_3873_helper.php b/code_igniter/application/helpers/snmp_3873_helper.php
index e084cdbfe..1f7376870 100644
--- a/code_igniter/application/helpers/snmp_3873_helper.php
+++ b/code_igniter/application/helpers/snmp_3873_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_429_helper.php b/code_igniter/application/helpers/snmp_429_helper.php
index 9dbeb1bf9..c128c4fd5 100644
--- a/code_igniter/application/helpers/snmp_429_helper.php
+++ b/code_igniter/application/helpers/snmp_429_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_43296_helper.php b/code_igniter/application/helpers/snmp_43296_helper.php
index 838464f9c..bfdd5adac 100644
--- a/code_igniter/application/helpers/snmp_43296_helper.php
+++ b/code_igniter/application/helpers/snmp_43296_helper.php
@@ -33,7 +33,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_43356_helper.php b/code_igniter/application/helpers/snmp_43356_helper.php
index d5db7635c..30c396725 100644
--- a/code_igniter/application/helpers/snmp_43356_helper.php
+++ b/code_igniter/application/helpers/snmp_43356_helper.php
@@ -33,7 +33,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_43_helper.php b/code_igniter/application/helpers/snmp_43_helper.php
index 8acffdfcb..38f065b31 100644
--- a/code_igniter/application/helpers/snmp_43_helper.php
+++ b/code_igniter/application/helpers/snmp_43_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_4458_helper.php b/code_igniter/application/helpers/snmp_4458_helper.php
index bddc062c5..ad2aad4c9 100644
--- a/code_igniter/application/helpers/snmp_4458_helper.php
+++ b/code_igniter/application/helpers/snmp_4458_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_4491_helper.php b/code_igniter/application/helpers/snmp_4491_helper.php
index 3ddbda65e..0b70c16ae 100644
--- a/code_igniter/application/helpers/snmp_4491_helper.php
+++ b/code_igniter/application/helpers/snmp_4491_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_4526_helper.php b/code_igniter/application/helpers/snmp_4526_helper.php
index c25a5e4bf..8f7fb857d 100644
--- a/code_igniter/application/helpers/snmp_4526_helper.php
+++ b/code_igniter/application/helpers/snmp_4526_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_45_helper.php b/code_igniter/application/helpers/snmp_45_helper.php
index 0a689f350..54d860097 100644
--- a/code_igniter/application/helpers/snmp_45_helper.php
+++ b/code_igniter/application/helpers/snmp_45_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_4874_helper.php b/code_igniter/application/helpers/snmp_4874_helper.php
index 257584f24..181f03120 100644
--- a/code_igniter/application/helpers/snmp_4874_helper.php
+++ b/code_igniter/application/helpers/snmp_4874_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_4900_helper.php b/code_igniter/application/helpers/snmp_4900_helper.php
index a927a8d95..456c59d71 100644
--- a/code_igniter/application/helpers/snmp_4900_helper.php
+++ b/code_igniter/application/helpers/snmp_4900_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_5227_helper.php b/code_igniter/application/helpers/snmp_5227_helper.php
index 39ad386b5..e411d8708 100644
--- a/code_igniter/application/helpers/snmp_5227_helper.php
+++ b/code_igniter/application/helpers/snmp_5227_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_52_helper.php b/code_igniter/application/helpers/snmp_52_helper.php
index 641fd23b1..2491d7baf 100644
--- a/code_igniter/application/helpers/snmp_52_helper.php
+++ b/code_igniter/application/helpers/snmp_52_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_5567_helper.php b/code_igniter/application/helpers/snmp_5567_helper.php
index cab6c0f6c..9f049326c 100644
--- a/code_igniter/application/helpers/snmp_5567_helper.php
+++ b/code_igniter/application/helpers/snmp_5567_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_5596_helper.php b/code_igniter/application/helpers/snmp_5596_helper.php
index a3004ab73..60790a09e 100644
--- a/code_igniter/application/helpers/snmp_5596_helper.php
+++ b/code_igniter/application/helpers/snmp_5596_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_5624_helper.php b/code_igniter/application/helpers/snmp_5624_helper.php
index f8b197120..0f67a4a0d 100644
--- a/code_igniter/application/helpers/snmp_5624_helper.php
+++ b/code_igniter/application/helpers/snmp_5624_helper.php
@@ -32,7 +32,7 @@
  * @package Open-AudIT
  * @author Mark Unwin <marku@opmantek.com>
  *
- * @version   2.0.8
+ * @version   2.0.10
 
  * @copyright Copyright (c) 2014, Opmantek
  * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
diff --git a/code_igniter/application/helpers/snmp_5776_helper.php b/code_igniter/application/helpers/snmp_5776_helper.php
index 99c9bb1f8..69e5dca0e 100644
--- a/code_igniter/application/helpers/snmp_5776_helper.php
+++ b/code_igniter/application/helpers/snmp_5776_helper.php
@@ -32,7 +32,7 @@
  * @package Open-AudIT
  * @author Mark Unwin <marku@opmantek.com>
  *
- * @version   2.0.8
+ * @version   2.0.10
 
  * @copyright Copyright (c) 2014, Opmantek
  * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
diff --git a/code_igniter/application/helpers/snmp_5951_helper.php b/code_igniter/application/helpers/snmp_5951_helper.php
index a5965a610..cfcf949c6 100644
--- a/code_igniter/application/helpers/snmp_5951_helper.php
+++ b/code_igniter/application/helpers/snmp_5951_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_6027_helper.php b/code_igniter/application/helpers/snmp_6027_helper.php
index 4f02c7dbd..c31042bdf 100644
--- a/code_igniter/application/helpers/snmp_6027_helper.php
+++ b/code_igniter/application/helpers/snmp_6027_helper.php
@@ -32,7 +32,7 @@
  * @package Open-AudIT
  * @author Mark Unwin <marku@opmantek.com>
  *
- * @version   2.0.8
+ * @version   2.0.10
 
  * @copyright Copyright (c) 2014, Opmantek
  * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
diff --git a/code_igniter/application/helpers/snmp_637_helper.php b/code_igniter/application/helpers/snmp_637_helper.php
index 7882fbb75..c9a8a16b6 100644
--- a/code_igniter/application/helpers/snmp_637_helper.php
+++ b/code_igniter/application/helpers/snmp_637_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_641_helper.php b/code_igniter/application/helpers/snmp_641_helper.php
index b7650001f..62b3bcebe 100644
--- a/code_igniter/application/helpers/snmp_641_helper.php
+++ b/code_igniter/application/helpers/snmp_641_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_6486_helper.php b/code_igniter/application/helpers/snmp_6486_helper.php
index 181f25511..766dc2e6b 100644
--- a/code_igniter/application/helpers/snmp_6486_helper.php
+++ b/code_igniter/application/helpers/snmp_6486_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_6527_helper.php b/code_igniter/application/helpers/snmp_6527_helper.php
index 1ceb88079..b6a96db96 100644
--- a/code_igniter/application/helpers/snmp_6527_helper.php
+++ b/code_igniter/application/helpers/snmp_6527_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_674_helper.php b/code_igniter/application/helpers/snmp_674_helper.php
index 200a5032e..2ca7637a6 100644
--- a/code_igniter/application/helpers/snmp_674_helper.php
+++ b/code_igniter/application/helpers/snmp_674_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_683_helper.php b/code_igniter/application/helpers/snmp_683_helper.php
index e5ae2828b..5152227b2 100644
--- a/code_igniter/application/helpers/snmp_683_helper.php
+++ b/code_igniter/application/helpers/snmp_683_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_6876_2_helper.php b/code_igniter/application/helpers/snmp_6876_2_helper.php
index c93a6fa33..6c0ef2c5e 100644
--- a/code_igniter/application/helpers/snmp_6876_2_helper.php
+++ b/code_igniter/application/helpers/snmp_6876_2_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_6876_helper.php b/code_igniter/application/helpers/snmp_6876_helper.php
index c76d19f9a..f86aca0f8 100644
--- a/code_igniter/application/helpers/snmp_6876_helper.php
+++ b/code_igniter/application/helpers/snmp_6876_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_6889_helper.php b/code_igniter/application/helpers/snmp_6889_helper.php
index 3531494f0..7a7064341 100644
--- a/code_igniter/application/helpers/snmp_6889_helper.php
+++ b/code_igniter/application/helpers/snmp_6889_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_705_helper.php b/code_igniter/application/helpers/snmp_705_helper.php
index cecb4363f..f18208b6a 100644
--- a/code_igniter/application/helpers/snmp_705_helper.php
+++ b/code_igniter/application/helpers/snmp_705_helper.php
@@ -33,7 +33,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_714_helper.php b/code_igniter/application/helpers/snmp_714_helper.php
index 0def50672..b45dc8590 100644
--- a/code_igniter/application/helpers/snmp_714_helper.php
+++ b/code_igniter/application/helpers/snmp_714_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_789_helper.php b/code_igniter/application/helpers/snmp_789_helper.php
index 125401e84..f02120034 100644
--- a/code_igniter/application/helpers/snmp_789_helper.php
+++ b/code_igniter/application/helpers/snmp_789_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_800_helper.php b/code_igniter/application/helpers/snmp_800_helper.php
index e7fd511df..867e28588 100644
--- a/code_igniter/application/helpers/snmp_800_helper.php
+++ b/code_igniter/application/helpers/snmp_800_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_8059_helper.php b/code_igniter/application/helpers/snmp_8059_helper.php
index 96d2da95c..b13094b02 100644
--- a/code_igniter/application/helpers/snmp_8059_helper.php
+++ b/code_igniter/application/helpers/snmp_8059_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_8072_helper.php b/code_igniter/application/helpers/snmp_8072_helper.php
index adef5e678..adf4e97bb 100644
--- a/code_igniter/application/helpers/snmp_8072_helper.php
+++ b/code_igniter/application/helpers/snmp_8072_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_818_helper.php b/code_igniter/application/helpers/snmp_818_helper.php
index 0f84650c2..c75027339 100644
--- a/code_igniter/application/helpers/snmp_818_helper.php
+++ b/code_igniter/application/helpers/snmp_818_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_81_helper.php b/code_igniter/application/helpers/snmp_81_helper.php
index a7406ef71..9b848d32d 100644
--- a/code_igniter/application/helpers/snmp_81_helper.php
+++ b/code_igniter/application/helpers/snmp_81_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_838_helper.php b/code_igniter/application/helpers/snmp_838_helper.php
index a7a9db36d..461c435c2 100644
--- a/code_igniter/application/helpers/snmp_838_helper.php
+++ b/code_igniter/application/helpers/snmp_838_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_850_helper.php b/code_igniter/application/helpers/snmp_850_helper.php
index 5a0c5fb47..5f67e96d9 100644
--- a/code_igniter/application/helpers/snmp_850_helper.php
+++ b/code_igniter/application/helpers/snmp_850_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_8741_helper.php b/code_igniter/application/helpers/snmp_8741_helper.php
index f1303b9cc..a99aa1feb 100644
--- a/code_igniter/application/helpers/snmp_8741_helper.php
+++ b/code_igniter/application/helpers/snmp_8741_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_890_helper.php b/code_igniter/application/helpers/snmp_890_helper.php
index 4c32baf15..8f21fbde6 100644
--- a/code_igniter/application/helpers/snmp_890_helper.php
+++ b/code_igniter/application/helpers/snmp_890_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/snmp_9_helper.php b/code_igniter/application/helpers/snmp_9_helper.php
index 5f70b8b6e..69f2d7e41 100644
--- a/code_igniter/application/helpers/snmp_9_helper.php
+++ b/code_igniter/application/helpers/snmp_9_helper.php
@@ -31,7 +31,7 @@
  * @package Open-AudIT
  * @author Mark Unwin <marku@opmantek.com>
  *
- * @version   2.0.8
+ * @version   2.0.10
 
  * @copyright Copyright (c) 2014, Opmantek
  * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
diff --git a/code_igniter/application/helpers/snmp_helper.php b/code_igniter/application/helpers/snmp_helper.php
index 7911f2fec..dcd14767d 100644
--- a/code_igniter/application/helpers/snmp_helper.php
+++ b/code_igniter/application/helpers/snmp_helper.php
@@ -29,7 +29,7 @@
  * @author Mark Unwin <marku@opmantek.com>
  *
  *
- * @version   2.0.8
+ * @version   2.0.10
 
  *
  * @copyright Copyright (c) 2014, Opmantek
diff --git a/code_igniter/application/helpers/snmp_oid_helper.php b/code_igniter/application/helpers/snmp_oid_helper.php
index 587b3a8ee..cc951ae81 100644
--- a/code_igniter/application/helpers/snmp_oid_helper.php
+++ b/code_igniter/application/helpers/snmp_oid_helper.php
@@ -31,7 +31,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/software_version_helper.php b/code_igniter/application/helpers/software_version_helper.php
index c0046b4df..61c61c7ef 100644
--- a/code_igniter/application/helpers/software_version_helper.php
+++ b/code_igniter/application/helpers/software_version_helper.php
@@ -34,7 +34,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/helpers/ssh_helper.php b/code_igniter/application/helpers/ssh_helper.php
index 2c48d42e1..3691cd5c7 100644
--- a/code_igniter/application/helpers/ssh_helper.php
+++ b/code_igniter/application/helpers/ssh_helper.php
@@ -32,7 +32,7 @@
  * @package Open-AudIT
  * @author Mark Unwin <marku@opmantek.com>
  *
- * @version   2.0.8
+ * @version   2.0.10
  * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
  */
 
@@ -219,8 +219,6 @@ function ssh_command($ip = '', $credentials = '', $command = '', $log, $sudo = '
         } else {
             set_include_path('c:\\xampplite\\open-audit\\code_igniter\\application\\third_party\\phpseclib');
         }
-        // include 'Crypt/RSA.php';
-        // include('Net/SSH2.php');
         require_once 'Crypt/RSA.php';
         require_once 'Net/SSH2.php';
         if (!defined('NET_SSH2_LOGGING')) {
@@ -407,31 +405,10 @@ function ssh_audit($ip = '', $credentials = '', $log)
             discovery_log($log);
             return false;
         }
+        $device = new stdClass();
 
-        // if ($credentials->type == 'ssh_key') {
-        //     $key = new Crypt_RSA();
-        //     if (!empty($credentials->credentials->password)) {
-        //         $key->setPassword($credentials->credentials->password);
-        //     }
-        //     $key->loadKey($credentials->credentials->ssh_key);
-        // }
-
-        // if ($ssh->login($credentials->credentials->username, $credentials->credentials->password)) {
-        //     $log->message = "Success, credentials named " . $credentials->name . " used to log in to $ip.";
-        //     discovery_log($log);
-        //     $username = $credentials->credentials->username;
-        //     $password = $credentials->credentials->password;
-        // } else {
-        //     $log->message = "Failure, credentials named " . $credentials->name . " not used to log in to $ip.";
-        //     discovery_log($log);
-        // }
-
-        // $hostname = $ssh->exec('hostname -s 2>/dev/null');
-        // $hostname = trim($hostname);
-        // if (!empty($hostname) and stripos($hostname, 'Use the Network Control Panel Applet to set hostname') !== false) {
         $windows_os_name = $ssh->exec('wmic os get name');
         if (stripos($windows_os_name, 'Microsoft Windows') !== false) {
-            $device = new stdClass();
             $device->type = 'computer';
             $device->os_group = 'Windows';
 
@@ -480,7 +457,7 @@ function ssh_audit($ip = '', $credentials = '', $log)
 
             $device->os_family = '';
             if (strpos($device->os_name, " 95") !== false) {
-                $device->os_family = "Windows 95";;
+                $device->os_family = "Windows 95";
             }
             if (strpos($device->os_name, " 98") !== false) {
                 $device->os_family = "Windows 98";
@@ -522,13 +499,64 @@ function ssh_audit($ip = '', $credentials = '', $log)
             return $device;
         }
 
+        # Before we attempt to run commands, test if we're running bash
+        $item_start = microtime(true);
+        $device->shell = trim($ssh->exec('echo $SHELL'));
+        $device->bash = '';
+        $log->command = 'echo $SHELL';
+        $log->command_output = $device->shell;
+        $log->command_time_to_execute = (microtime(true) - $item_start);
+        $log->command_status = '';
+        $log->message = 'The default shell for ' . $username . ' is ' . $device->shell;
+
+        if (strpos($device->shell, 'bash') === false) {
+            $log->message = 'Warning - ' . $log->message;
+            $log->severity = 5;
+            discovery_log($log);
+            $log->severity = 7;
+        } else {
+            discovery_log($log);
+        }
+
+        if (strpos($device->shell, 'bash') === false) {
+            $item_start = microtime(true);
+            $device->bash = trim($ssh->exec('which bash'));
+            $log->command = 'which bash';
+            $log->command_output = $device->bash;
+            $log->command_time_to_execute = (microtime(true) - $item_start);
+            $log->command_status = '';
+            if ($device->bash != '') {
+                $log->message = 'Testing for bash - installed';
+                discovery_log($log);
+            } else {
+                $log->message = 'Warning - bash not installed';
+                discovery_log($log);
+            }
+        }
+
+        if (strpos($device->shell, 'bash') === false) {
+            if ($device->bash === '') {
+                $log->severity = 4;
+                $log->message = 'Warning - Running commands in a shell other than bash may fail.';
+            } else {
+                $log->severity = 5;
+                $log->message = 'Notice - Will use ' . $device->bash . ' to run commands.';
+            }
+            $log->command = '';
+            $log->command_output = '';
+            $log->command_time_to_execute = '';
+            $log->command_status = '';
+            discovery_log($log);
+            $log->severity = 7;
+        }
+
         $commands = array(
             'hostname' => 'hostname -s 2>/dev/null',
             'domain' => 'hostname -d 2>/dev/null',
             'fqdn' => 'hostname -f 2>/dev/null | grep -F . 2>/dev/null',
             'solaris_domain' => 'domainname 2>/dev/null',
 
-            'osx_serial' => 'system_profiler SPHardwareDataType 2>/dev/null | grep \'Serial Number (system):\' | cut -d\':\' -f2 | sed \'s/^ *//g\'',
+            'osx_serial' => 'system_profiler SPHardwareDataType 2>/dev/null | grep "Serial Number (system):" | cut -d: -f2 | sed "s/^ *//g"',
 
             'os_group' => 'uname 2>/dev/null',
             'os_name' => 'cat /etc/os-release 2>/dev/null | grep -i ^PRETTY_NAME | cut -d= -f2 | cut -d\" -f2',
@@ -538,24 +566,26 @@ function ssh_audit($ip = '', $credentials = '', $log)
             'ubuntu_os_codename' => 'cat /etc/os-release 2>/dev/null | grep -i ^UBUNTU_CODENAME | cut -d= -f2 | cut -d\" -f2',
             'vmware_os_version' => 'uname -r 2>/dev/null',
             'osx_os_version' => 'sw_vers 2>/dev/null | grep "ProductVersion:" | cut -f2',
-            'ubiquiti_os' => 'cat /etc/motd 2>/dev/null | grep -i EdgeOS',
+            'ubiquiti_os' => 'cat /etc/motd 2>/dev/null | grep -i EdgeOS 2>/dev/null',
             'ubiquiti_os_version' => 'cat /etc/version 2>/dev/null',
-            'ddwrt_os_name' => 'cat /etc/motd 2>/dev/null | grep -i DD-WRT',
+            'ddwrt_os_name' => 'cat /etc/motd 2>/dev/null | grep -i DD-WRT 2>/dev/null',
 
             'ddwrt_model' => 'nvram get DD_BOARD 2>/dev/null',
             'ubiquiti_model' => 'cat /etc/board.info 2>/dev/null | grep "board.name" | cut -d= -f2',
 
-            'dbus_machine_id' => 'cat /var/lib/dbus/machine-id 2>/dev/null',
-            'solaris_uuid' => 'smbios -t SMB_TYPE_SYSTEM 2>/dev/null | grep UUID | awk \'{print $2}\'',
-            'esx_uuid' => "vim-cmd hostsvc/hostsummary 2>/dev/null | sed -n '/^   hardware = (vim.host.Summary.HardwareSummary) {/,/^   \},/p' | grep uuid | cut -d= -f2 | sed 's/,//g' | sed 's/\\\"//g'",
+            'dbus_identifier' => 'cat /var/lib/dbus/machine-id 2>/dev/null',
+            'solaris_uuid' => 'smbios -t SMB_TYPE_SYSTEM 2>/dev/null | grep UUID | awk "{print $2}"',
+            'esx_uuid' => 'vim-cmd hostsvc/hostsummary 2>/dev/null | sed -n "/^   hardware = (vim.host.Summary.HardwareSummary) {/,/^   \},/p" | grep uuid | cut -d= -f2 | sed s/,//g | sed s/\"//g',
             'osx_uuid' => 'system_profiler SPHardwareDataType 2>/dev/null | grep UUID | cut -d: -f2',
-            'lshal_uuid' => "lshal 2>/dev/null | grep 'system.hardware.uuid' | cut -d\' -f2",
+            'lshal_uuid' => 'lshal 2>/dev/null | grep "system.hardware.uuid"',
 
             'which_sudo' => 'which sudo 2>/dev/null'
         );
 
-        $device = new stdClass();
         foreach ($commands as $item => $command) {
+            if (strpos($device->shell, 'bash') === false and $device->bash !== '') {
+                $command = $device->bash . " -c '" . $command . "'";
+            }
             $item_start = microtime(true);
             $temp1 = $ssh->exec($command);
             $temp1 = trim($temp1);
@@ -618,7 +648,7 @@ function ssh_audit($ip = '', $credentials = '', $log)
             $device->os_family = 'Ubiquiti';
             $device->type = 'router';
             $device->manufacturer = 'Ubiquiti Networks Inc.';
-        }    
+        }
         unset($device->ubiquiti_os);
         if (!empty($device->ubiquiti_os_version)) {
             $device->os_family = 'Ubiquiti';
@@ -696,18 +726,29 @@ function ssh_audit($ip = '', $credentials = '', $log)
         $array = array('solaris_uuid', 'esx_uuid', 'osx_uuid', 'lshal_uuid');
         foreach ($array as $attribute) {
             if (empty($device->uuid) and !empty($device->$attribute)) {
+                if ($attribute == 'lshal_uuid') {
+                    $temp = explode("'", $device->lshal_uuid);
+                    $device->lshal_uuid = $temp[1];
+                }
                 $device->uuid = $device->$attribute;
             }
             unset($device->$attribute);
         }
 
         unset($array);
-        if (empty($device->uuid)) {
-            if ($username != 'root') {
+        if (empty($device->dbus_identifier)) {
+            if (empty($device->uuid) and $username != 'root') {
                 if (!empty($device->which_sudo)) {
+                    # Run DMIDECODE to get the UUID (requires root or sudo)
                     $output = '';
                     $item_start = microtime(true);
-                    $ssh->write($device->which_sudo . " dmidecode -s system-uuid 2>/dev/null\n");
+                    $command = $device->which_sudo . " dmidecode -s system-uuid 2>/dev/null";
+                    if (strpos($device->shell, 'bash') === false and $device->bash !== '') {
+                        $command = $device->bash . " -c '" . $command . "'\n";
+                    } else {
+                        $command .= "\n";
+                    }
+                    $ssh->write($command);
                     $output = $ssh->read('assword');
                     if (stripos($output, 'assword') !== false) {
                         $ssh->write($password."\n");
@@ -715,22 +756,28 @@ function ssh_audit($ip = '', $credentials = '', $log)
                     }
                     $lines = explode("\n", $output);
                     $device->uuid = trim($lines[count($lines)-2]);
-                    if (strpos($device->uuid, $device->which_sudo . ' dmidecode -s system-uuid 2>/dev/null') !== false) {
-                        $device->uuid = '';
-                    }
-                    if ($device->uuid == ':') {
+                    if ($device->uuid == ':' or strpos($device->uuid, 'dmidecode -s system-uuid 2>/dev/null') !== false) {
                         $device->uuid = '';
                     }
+                    $log->command = $command . '; # uuid';
+                    $log->command_time_to_execute = (microtime(true) - $item_start);
+                    $log->command_output = '';
+                    $log->message = 'SSH command';
+
                     if (empty($device->uuid)) {
-                        $log->command = $device->which_sudo . ' dmidecode -s system-uuid 2>/dev/null; # uuid';
-                        $log->command_time_to_execute = (microtime(true) - $item_start);
-                        $log->command_output = '';
                         $log->command_status = 'fail';
-                        $log->message = 'SSH command';
                         discovery_log($log);
+
+                        # Try to cat a file to get the UUID
                         $output = '';
                         $item_start = microtime(true);
-                        $ssh->write($device->which_sudo . " cat /sys/class/dmi/id/product_uuid 2>/dev/null\n");
+                        $command = $device->which_sudo . " cat /sys/class/dmi/id/product_uuid 2>/dev/null";
+                        if (strpos($device->shell, 'bash') === false and $device->bash !== '') {
+                            $command = $device->bash . " -c '" . $command . "'";
+                        } else {
+                            $command .= "\n";
+                        }
+                        $ssh->write($command);
                         $output = $ssh->read('assword');
                         if (stripos($output, 'assword') !== false) {
                             $ssh->write($password."\n");
@@ -738,72 +785,73 @@ function ssh_audit($ip = '', $credentials = '', $log)
                         }
                         $lines = explode("\n", $output);
                         $device->uuid = trim($lines[count($lines)-2]);
-                        if (stripos($device->uuid, $device->which_sudo . ' cat /sys/class/dmi/id/product_uuid 2>/dev/null') !== false) {
+                        if (stripos($device->uuid, 'cat /sys/class/dmi/id/product_uuid 2>/dev/null') !== false) {
                             $device->uuid = '';
                         }
+                        $log->command = $command . '; # uuid';
+                        $log->command_time_to_execute = (microtime(true) - $item_start);
+                        $log->command_output = '';
+                        $log->message = 'SSH command';
                         if (!empty($device->uuid)) {
-                            $log->command = $device->which_sudo . ' cat /sys/class/dmi/id/product_uuid 2>/dev/null; # uuid';
-                            $log->command_time_to_execute = (microtime(true) - $item_start);
                             $log->command_output = $device->uuid;
                             $log->command_status = 'success';
-                            $log->message = 'SSH command';
-                            discovery_log($log);
                         } else {
-                            $log->command = $device->which_sudo . ' cat /sys/class/dmi/id/product_uuid 2>/dev/null; # uuid';
-                            $log->command_time_to_execute = (microtime(true) - $item_start);
-                            $log->command_output = '';
                             $log->command_status = 'fail';
-                            $log->message = 'SSH command';
-                            discovery_log($log);
                         }
+                        discovery_log($log);
                     } else {
-                        $log->command = $device->which_sudo . ' dmidecode -s system-uuid 2>/dev/null; # uuid';
-                        $log->command_time_to_execute = (microtime(true) - $item_start);
                         $log->command_output = $device->uuid;
                         $log->command_status = 'success';
-                        $log->message = 'SSH command';
                         discovery_log($log);
                     }
                 }
                 if (empty($device->uuid)) {
                     unset($device->uuid);
                 }
-            } else {
+            }
+
+            if (empty($device->uuid) and $username == 'root') {
                 $item_start = microtime(true);
-                $device->uuid = trim($ssh->exec('dmidecode -s system-uuid 2>/dev/null'));
+                $command = 'dmidecode -s system-uuid 2>/dev/null';
+                if (strpos($device->shell, 'bash') === false and $device->bash !== '') {
+                    $command = $device->bash . " -c '" . $command . "'";
+                }
+                $device->uuid = trim($ssh->exec($command));
+                $log->command_output = json_encode(explode($device->uuid, "\n"));
                 if (strpos($device->uuid, 'dmidecode -s system-uuid 2>/dev/null') !== false) {
                     $device->uuid = '';
                 }
+
+                $log->command = $command .'; # uuid';
+                $log->command_time_to_execute = (microtime(true) - $item_start);
+                $log->message = 'SSH command';
                 if (empty($device->uuid)) {
-                    $log->command = 'dmidecode -s system-uuid 2>/dev/null; # uuid';
-                    $log->command_time_to_execute = (microtime(true) - $item_start);
-                    $log->command_output = '';
+                    $log->command_output = $ssh->getErrors();
                     $log->command_status = 'fail';
-                    $log->message = 'SSH command';
                     discovery_log($log);
+
                     $item_start = microtime(true);
-                    $device->uuid = trim($ssh->exec('cat /sys/class/dmi/id/product_uuid 2>/dev/null'));
+                    $command = 'cat /sys/class/dmi/id/product_uuid 2>/dev/null';
+                    if (strpos($device->shell, 'bash') === false and $device->bash !== '') {
+                        $command = $device->bash . " -c '" . $command . "'";
+                    }
+
+                    $device->uuid = trim($ssh->exec($command));
+                    $log->command = $command . '; # uuid';
+                    $log->message = 'SSH command';
+                    $log->command_time_to_execute = (microtime(true) - $item_start);
                     if (empty($device->uuid)) {
-                        $log->command = 'dmidecode -s system-uuid 2>/dev/null; # uuid';
-                        $log->command_time_to_execute = (microtime(true) - $item_start);
-                        $log->command_output = '';
+                        $log->command_output = $ssh->getErrors();
                         $log->command_status = 'fail';
-                        $log->message = 'SSH command';
                         discovery_log($log);
                     } else {
-                        $log->command = 'dmidecode -s system-uuid 2>/dev/null; # uuid';
-                        $log->command_time_to_execute = (microtime(true) - $item_start);
                         $log->command_output = $device->uuid;
                         $log->command_status = 'success';
-                        $log->message = 'SSH command';
                         discovery_log($log);
                     }
                 } else {
-                    $log->command = 'dmidecode -s system-uuid 2>/dev/null; # uuid';
-                    $log->command_time_to_execute = (microtime(true) - $item_start);
                     $log->command_output = $device->uuid;
                     $log->command_status = 'success';
-                    $log->message = 'SSH command';
                     discovery_log($log);
                 }
             }
@@ -1426,7 +1474,6 @@ function ssh_audit_old($ip = '', $credentials = '', $log)
                 //         }
                 //     }
                 // }
-
             }
         }
         $command = 'cat /etc/board.info | grep "board.name';
diff --git a/code_igniter/application/helpers/ssh_helper_orig.php b/code_igniter/application/helpers/ssh_helper_orig.php
index 4a6d708f4..88a52601d 100644
--- a/code_igniter/application/helpers/ssh_helper_orig.php
+++ b/code_igniter/application/helpers/ssh_helper_orig.php
@@ -32,7 +32,7 @@
  * @package Open-AudIT
  * @author Mark Unwin <marku@opmantek.com>
  *
- * @version   2.0.8
+ * @version   2.0.10
  * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
  */
 if (! function_exists('ssh_create_keyfile')) {
diff --git a/code_igniter/application/helpers/wmi_helper.php b/code_igniter/application/helpers/wmi_helper.php
index 6d5f46ece..01c4ad08e 100644
--- a/code_igniter/application/helpers/wmi_helper.php
+++ b/code_igniter/application/helpers/wmi_helper.php
@@ -32,7 +32,7 @@
  * @package Open-AudIT
  * @author Mark Unwin <marku@opmantek.com>
  *
- * @version   2.0.8
+ * @version   2.0.10
  * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
  */
 
diff --git a/code_igniter/application/models/m_agents.php b/code_igniter/application/models/m_agents.php
index 9580de02f..fc16681fb 100644
--- a/code_igniter/application/models/m_agents.php
+++ b/code_igniter/application/models/m_agents.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 class M_agents extends MY_Model
diff --git a/code_igniter/application/models/m_attributes.php b/code_igniter/application/models/m_attributes.php
index d65248d6f..2d4dceb54 100644
--- a/code_igniter/application/models/m_attributes.php
+++ b/code_igniter/application/models/m_attributes.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 class M_attributes extends MY_Model
diff --git a/code_igniter/application/models/m_audit_log.php b/code_igniter/application/models/m_audit_log.php
index f5b4cd230..b37e8e053 100644
--- a/code_igniter/application/models/m_audit_log.php
+++ b/code_igniter/application/models/m_audit_log.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 class M_audit_log extends MY_Model
diff --git a/code_igniter/application/models/m_change_log.php b/code_igniter/application/models/m_change_log.php
index 110135e1c..4da8590af 100644
--- a/code_igniter/application/models/m_change_log.php
+++ b/code_igniter/application/models/m_change_log.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/models/m_charts.php b/code_igniter/application/models/m_charts.php
index fb0507556..601cd9f5c 100644
--- a/code_igniter/application/models/m_charts.php
+++ b/code_igniter/application/models/m_charts.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 class M_charts extends MY_Model
diff --git a/code_igniter/application/models/m_collection.php b/code_igniter/application/models/m_collection.php
index 35760e431..6beb68aca 100644
--- a/code_igniter/application/models/m_collection.php
+++ b/code_igniter/application/models/m_collection.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 class M_collection extends MY_Model
@@ -649,10 +649,6 @@ public function update($data = null, $collection = '')
 
         if ($collection === 'scripts') {
             if (!empty($data->options)) {
-                $received = new stdClass();
-                foreach ($data->options as $key => $value) {
-                        $received->$key = $value;
-                }
                 $select = "SELECT * FROM scripts WHERE id = ?";
                 $query = $this->db->query($select, array($data->id));
                 $result = $query->result();
@@ -661,15 +657,10 @@ public function update($data = null, $collection = '')
                 } else {
                     $existing = new stdClass();
                 }
-                $new = new stdClass();
-                foreach ($existing as $existing_key => $existing_value) {
-                    if (isset($received->$existing_key)) {
-                        $new->$existing_key = $received->$existing_key;
-                    } else {
-                        $new->$existing_key = $existing->$existing_key;
-                    }
+                foreach ($data->options as $key => $value) {
+                    $existing->$key = $value;
                 }
-                $data->options = (string)json_encode($new);
+                $data->options = (string)json_encode($existing);
             }
         }
 
diff --git a/code_igniter/application/models/m_collectors.php b/code_igniter/application/models/m_collectors.php
index 62af6a999..d11b4b865 100644
--- a/code_igniter/application/models/m_collectors.php
+++ b/code_igniter/application/models/m_collectors.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 class M_collectors extends MY_Model
diff --git a/code_igniter/application/models/m_configuration.php b/code_igniter/application/models/m_configuration.php
index 74a1109d6..fedd6f4f5 100644
--- a/code_igniter/application/models/m_configuration.php
+++ b/code_igniter/application/models/m_configuration.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 class M_configuration extends MY_Model
diff --git a/code_igniter/application/models/m_connections.php b/code_igniter/application/models/m_connections.php
index aa595c1c4..36da118b7 100644
--- a/code_igniter/application/models/m_connections.php
+++ b/code_igniter/application/models/m_connections.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 class M_connections extends MY_Model
diff --git a/code_igniter/application/models/m_credentials.php b/code_igniter/application/models/m_credentials.php
index 401e75a39..641074a8a 100644
--- a/code_igniter/application/models/m_credentials.php
+++ b/code_igniter/application/models/m_credentials.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 class M_credentials extends MY_Model
diff --git a/code_igniter/application/models/m_database.php b/code_igniter/application/models/m_database.php
index 015acbc9f..100c9d24e 100644
--- a/code_igniter/application/models/m_database.php
+++ b/code_igniter/application/models/m_database.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 class M_database extends MY_Model
diff --git a/code_igniter/application/models/m_device.php b/code_igniter/application/models/m_device.php
index 699845059..d90d6820f 100644
--- a/code_igniter/application/models/m_device.php
+++ b/code_igniter/application/models/m_device.php
@@ -28,7 +28,7 @@
  * @author Mark Unwin <marku@opmantek.com>
  *
  *
- * @version   2.0.8
+ * @version   2.0.10
 
  *
  * @copyright Copyright (c) 2014, Opmantek
@@ -88,7 +88,7 @@ public function match($details, $command = '')
         } else {
             # we have an ip address in the hostname field - remove it
             # likely because DNS is not fully setup and working correctly
-            $log_message[] = "Provided hostame is actually an IP address (" . $details->hostname . ").";
+            $log_message[] = "Provided hostname is actually an IP address (" . $details->hostname . ").";
             if (empty($details->ip)) {
                 $details->ip = $details->hostname;
                 $log_message[] = "No IP provided, but provided hostname is an IP. Storing in ip (" . $details->ip . ").";
diff --git a/code_igniter/application/models/m_devices.php b/code_igniter/application/models/m_devices.php
index aff873caf..a795b9ea0 100644
--- a/code_igniter/application/models/m_devices.php
+++ b/code_igniter/application/models/m_devices.php
@@ -28,7 +28,7 @@
  * @author Mark Unwin <marku@opmantek.com>
  *
  *
- * @version   2.0.8
+ * @version   2.0.10
 
  *
  * @copyright Copyright (c) 2014, Opmantek
@@ -559,28 +559,32 @@ public function collection()
         unset($result);
         $sql = "/* m_devices::collection */ " . "SELECT " . $CI->response->meta->internal->properties . " FROM system " . $join . " WHERE system.org_id IN (" . $CI->user->org_list . ") " . $filter . " " . $CI->response->meta->internal->groupby . " " . $CI->response->meta->internal->sort . " " . $CI->response->meta->internal->limit;
         $result = $this->run_sql($sql, array());
-        if ($CI->response->meta->format == 'json' or $CI->response->meta->format == 'json_data') {
-            $sql = "/* m_devices::collection */ " . "SELECT audit_log.system_id AS `id`, GROUP_CONCAT(DISTINCT(audit_log.type) ORDER BY audit_log.type) AS `seen_by` FROM audit_log LEFT JOIN system ON audit_log.system_id = system.id WHERE system.org_id IN (" . $CI->user->org_list . ") GROUP BY audit_log.system_id";
-            $seen_by = $this->run_sql($sql, array());
-            $seen_by_temp = array();
-            foreach ($seen_by as $seen) {
-                $seen_by_temp[$seen->id] = $seen->seen_by;
-            }
-            unset($seen_by);
-            for ($i=0; $i < count($result); $i++) {
-                if (!empty($result[$i]->{'system.id'})) {
-                    if (!empty($seen_by_temp[$result[$i]->{'system.id'}])) {
-                        #$result[$i]->{'system.seen_by'} = $seen_by_temp[$result[$i]->{'system.id'}];
-                        $result[$i]->{'seen_by'} = $seen_by_temp[$result[$i]->{'system.id'}];
-                    } else {
-                        $result[$i]->seen_by = '';
-                    }
-                } else {
-                    $result[$i]->seen_by = '';
-                }
-            }
-            unset($seen_by_temp);
-        }
+
+        # TODO - make a system.seen_by and populate upon audit received or 
+        # discovery recieved.
+
+        // if ($CI->response->meta->format == 'json' or $CI->response->meta->format == 'json_data') {
+        //     $sql = "/* m_devices::collection */ " . "SELECT audit_log.system_id AS `id`, GROUP_CONCAT(DISTINCT(audit_log.type) ORDER BY audit_log.type) AS `seen_by` FROM audit_log LEFT JOIN system ON audit_log.system_id = system.id WHERE system.org_id IN (" . $CI->user->org_list . ") GROUP BY audit_log.system_id";
+        //     $seen_by = $this->run_sql($sql, array());
+        //     $seen_by_temp = array();
+        //     foreach ($seen_by as $seen) {
+        //         $seen_by_temp[$seen->id] = $seen->seen_by;
+        //     }
+        //     unset($seen_by);
+        //     for ($i=0; $i < count($result); $i++) {
+        //         if (!empty($result[$i]->{'system.id'})) {
+        //             if (!empty($seen_by_temp[$result[$i]->{'system.id'}])) {
+        //                 #$result[$i]->{'system.seen_by'} = $seen_by_temp[$result[$i]->{'system.id'}];
+        //                 $result[$i]->{'seen_by'} = $seen_by_temp[$result[$i]->{'system.id'}];
+        //             } else {
+        //                 $result[$i]->seen_by = '';
+        //             }
+        //         } else {
+        //             $result[$i]->seen_by = '';
+        //         }
+        //     }
+        //     unset($seen_by_temp);
+        // }
         $result = $this->format_data($result, 'devices');
         return $result;
     }
diff --git a/code_igniter/application/models/m_devices_components.php b/code_igniter/application/models/m_devices_components.php
index a31095134..3d1e55a30 100644
--- a/code_igniter/application/models/m_devices_components.php
+++ b/code_igniter/application/models/m_devices_components.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 class M_devices_components extends MY_Model
@@ -299,9 +299,7 @@ public function match_columns($table)
 
     public function process_component($table = '', $details, $input, $display = 'n', $match_columns = array())
     {
-
         $create_alerts = $this->config->config['discovery_create_alerts'];
-        $delete_noncurrent = $this->config->config['delete_noncurrent'];
 
         $log = new stdClass();
         $log->discovery_id = (string)@$details->discovery_id;
@@ -360,7 +358,6 @@ public function process_component($table = '', $details, $input, $display = 'n',
                 $log->message = 'No columns to match supplied for '.@ip_address_from_db($details->ip).' ('.$name.')';
                 $message = "$table - No columns to match supplied - failed";
             }
-            # if (!isset($details->id)) { # this will be changed when we convert the system table
             if (!isset($details->id)) {
                 $log->message = 'No id supplied for '.@ip_address_from_db($details->ip).' ('.$name.')';
                 $message = "$table - No id supplied - failed";
@@ -378,13 +375,18 @@ public function process_component($table = '', $details, $input, $display = 'n',
             // discovery_log($log);
         }
 
+        ### NETSTAT ###
+        # Need to do this first as until we convert the data
+        # there won't be an input->item
+        if ((string)$table == 'netstat') {
+            $input = $this->format_netstat_data($input, $details);
+        }
+
         // make sure we have an entry for each match column, even if it's empty
-        if ($table != 'netstat') {
-            foreach ($match_columns as $match_column) {
-                for ($i=0; $i<count($input->item); $i++) {
-                    if (isset($input->item[$i]) and !isset($input->item[$i]->$match_column)) {
-                        $input->item[$i]->$match_column = '';
-                    }
+        foreach ($match_columns as $match_column) {
+            for ($i=0; $i<count($input->item); $i++) {
+                if (isset($input->item[$i]) and !isset($input->item[$i]->$match_column)) {
+                    $input->item[$i]->$match_column = '';
                 }
             }
         }
@@ -472,11 +474,6 @@ public function process_component($table = '', $details, $input, $display = 'n',
             }
         }
 
-        ### NETSTAT ###
-        if ((string)$table == 'netstat') {
-            $input = $this->format_netstat_data($input, $details);
-        }
-
         ### NETWORK ###
         # depending on the device type we need to alter our matching columns for the network card
         if ((string)$table == 'network') {
@@ -779,43 +776,57 @@ public function process_component($table = '', $details, $input, $display = 'n',
             $log->severity = 7;
             discovery_log($log);
         }
-        foreach ($db_result as $db_item) {
-            if (strtolower($delete_noncurrent) == 'y') {
+
+        if (!empty($this->config->config['delete_noncurrent']) and strtolower($this->config->config['delete_noncurrent']) == 'y') {
+            foreach ($db_result as $db_item) {
                 $sql = "DELETE FROM `$table` WHERE `id` = ?";
                 $sql = $this->clean_sql($sql);
                 $data = array($db_item->id);
                 $query = $this->db->query($sql, $data);
-            } else {
-                $sql = "UPDATE `$table` SET current = 'n' WHERE id = ?";
+            }
+            return;
+        }
+
+        if (!empty($this->config->config['delete_noncurrent_' . $table]) and strtolower($this->config->config['delete_noncurrent_' . $table]) == 'y') {
+            foreach ($db_result as $db_item) {
+                $sql = "DELETE FROM `$table` WHERE `id` = ?";
                 $sql = $this->clean_sql($sql);
                 $data = array($db_item->id);
                 $query = $this->db->query($sql, $data);
-                if (strtolower($create_alerts) == 'y') {
-                    $alert_details = '';
-                    foreach ($match_columns as $key => $value) {
-                        if (!empty($db_item->$value)) {
-                            $alert_details .= $value . ' is ' . $db_item->$value . ', ';
-                        }
-                    }
-                    $alert_details = substr($alert_details, 0, -2);
-                    $alert_details = "Item removed from $table - " . $alert_details;
-                    if (!isset($details->last_seen) or $details->last_seen == '0000-00-00 00:00:00' or $details->last_seen =='') {
-                        $sql = "SELECT last_seen FROM `system` WHERE id = ?";
-                        $sql = $this->clean_sql($sql);
-                        $data = array($details->id);
-                        $query = $this->db->query($sql, $data);
-                        $result = $query->result();
-                        $details->last_seen = $result[0]->last_seen;
+            }
+            return;
+        }
+
+        foreach ($db_result as $db_item) {
+            $sql = "UPDATE `$table` SET current = 'n' WHERE id = ?";
+            $sql = $this->clean_sql($sql);
+            $data = array($db_item->id);
+            $query = $this->db->query($sql, $data);
+            if (strtolower($create_alerts) == 'y') {
+                $alert_details = '';
+                foreach ($match_columns as $key => $value) {
+                    if (!empty($db_item->$value)) {
+                        $alert_details .= $value . ' is ' . $db_item->$value . ', ';
                     }
-                    $sql = "INSERT INTO change_log (system_id, db_table, db_row, db_action, details, `timestamp`) VALUES (?, ?, ?, ?, ?, ?)";
+                }
+                $alert_details = substr($alert_details, 0, -2);
+                $alert_details = "Item removed from $table - " . $alert_details;
+                if (!isset($details->last_seen) or $details->last_seen == '0000-00-00 00:00:00' or $details->last_seen =='') {
+                    $sql = "SELECT last_seen FROM `system` WHERE id = ?";
                     $sql = $this->clean_sql($sql);
-                    $data = array("$details->id", "$table", "$db_item->id", "delete", "$alert_details", "$details->last_seen");
+                    $data = array($details->id);
                     $query = $this->db->query($sql, $data);
-                    # add a count to our chart table
-                    $sql = "INSERT INTO chart (`when`, `what`, `org_id`, `count`) VALUES (DATE(NOW()), '" . $table . "_delete', " . intval($details->org_id) . ", 1) ON DUPLICATE KEY UPDATE `count` = `count` + 1";
-                    $sql = $this->clean_sql($sql);
-                    $query = $this->db->query($sql);
+                    $result = $query->result();
+                    $details->last_seen = $result[0]->last_seen;
                 }
+                $sql = "INSERT INTO change_log (system_id, db_table, db_row, db_action, details, `timestamp`) VALUES (?, ?, ?, ?, ?, ?)";
+                $sql = $this->clean_sql($sql);
+                $data = array("$details->id", "$table", "$db_item->id", "delete", "$alert_details", "$details->last_seen");
+                $query = $this->db->query($sql, $data);
+                # add a count to our chart table
+                $sql = "INSERT INTO chart (`when`, `what`, `org_id`, `count`) VALUES (DATE(NOW()), '" . $table . "_delete', " . intval($details->org_id) . ", 1) ON DUPLICATE KEY UPDATE `count` = `count` + 1";
+                $sql = $this->clean_sql($sql);
+                $query = $this->db->query($sql);
             }
         }
         # removed - just way too much log output
@@ -1166,10 +1177,7 @@ public function get_sql_server_version_string($version)
 
     public function format_netstat_data($input, $details)
     {
-        $lines = array();
-        foreach ($input->item as $item) {
-            $lines[] = $item->line;
-        }
+        $lines = explode("\n", $input);
         if (count($lines) == 0) {
             define('NL_NIX', "\n");
             define('NL_WIN', "\r\n");
@@ -1253,7 +1261,6 @@ public function format_netstat_data($input, $details)
                     }
                     if ($i->protocol != '') {
                         $input_array[] = $i;
-                        print_r($i);
                     }
                 }
             }
diff --git a/code_igniter/application/models/m_discoveries.php b/code_igniter/application/models/m_discoveries.php
index 79237e9e6..e405a986d 100644
--- a/code_igniter/application/models/m_discoveries.php
+++ b/code_igniter/application/models/m_discoveries.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 class M_discoveries extends MY_Model
diff --git a/code_igniter/application/models/m_edit_log.php b/code_igniter/application/models/m_edit_log.php
index ee2c049ae..a2fad6e34 100644
--- a/code_igniter/application/models/m_edit_log.php
+++ b/code_igniter/application/models/m_edit_log.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 class M_edit_log extends MY_Model
diff --git a/code_igniter/application/models/m_errors.php b/code_igniter/application/models/m_errors.php
index 636f15447..1f12dac4b 100644
--- a/code_igniter/application/models/m_errors.php
+++ b/code_igniter/application/models/m_errors.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 class M_errors extends MY_Model
diff --git a/code_igniter/application/models/m_fields.php b/code_igniter/application/models/m_fields.php
index f91d5adb6..400c05b82 100644
--- a/code_igniter/application/models/m_fields.php
+++ b/code_igniter/application/models/m_fields.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 class M_fields extends MY_Model
diff --git a/code_igniter/application/models/m_files.php b/code_igniter/application/models/m_files.php
index 165a256f8..5d8d0289a 100644
--- a/code_igniter/application/models/m_files.php
+++ b/code_igniter/application/models/m_files.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 class M_files extends MY_Model
diff --git a/code_igniter/application/models/m_groups.php b/code_igniter/application/models/m_groups.php
index 1b19214aa..fb13899ff 100644
--- a/code_igniter/application/models/m_groups.php
+++ b/code_igniter/application/models/m_groups.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 class M_groups extends MY_Model
diff --git a/code_igniter/application/models/m_ldap_servers.php b/code_igniter/application/models/m_ldap_servers.php
index b8e281bbc..3b423adeb 100644
--- a/code_igniter/application/models/m_ldap_servers.php
+++ b/code_igniter/application/models/m_ldap_servers.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 class M_ldap_servers extends MY_Model
diff --git a/code_igniter/application/models/m_licenses.php b/code_igniter/application/models/m_licenses.php
index 2b995b96c..dba246d18 100644
--- a/code_igniter/application/models/m_licenses.php
+++ b/code_igniter/application/models/m_licenses.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 class M_licenses extends MY_Model
diff --git a/code_igniter/application/models/m_locations.php b/code_igniter/application/models/m_locations.php
index 32f42f3bf..755b0fdb5 100644
--- a/code_igniter/application/models/m_locations.php
+++ b/code_igniter/application/models/m_locations.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 class M_locations extends MY_Model
diff --git a/code_igniter/application/models/m_logon.php b/code_igniter/application/models/m_logon.php
index 215d16b68..263f4e5a1 100644
--- a/code_igniter/application/models/m_logon.php
+++ b/code_igniter/application/models/m_logon.php
@@ -28,7 +28,7 @@
  * @author Mark Unwin <marku@opmantek.com>
  *
  *
- * @version   2.0.8
+ * @version   2.0.10
 
  *
  * @copyright Copyright (c) 2014, Opmantek
@@ -242,7 +242,8 @@ public function logon($id = '')
                                 $user->lang = (string)$ldap->lang;
                                 $user->active = 'y';
                                 $user->ldap = '';
-                                //$user->primarygroupid = @$entries[0]['primarygroupid'][0];
+                                $user->type = 'user';
+                                $user->edited_by = 'system';
                                 if ($ldap->type == 'active directory') {
                                     $user->ldap = @(string)$entries[0]['distinguishedname'][0];
                                 }
@@ -358,7 +359,7 @@ public function logon($id = '')
                                 $log->message = "New user $username logged on (AD account).";
                                 $log->severity = 5;
                                 if ($this->db->table_exists('users')) {
-                                    $user_sql = "/* m_logon::logon */" . "INSERT INTO users VALUES (NULL, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NOW())";
+                                    $user_sql = "/* m_logon::logon */" . "INSERT INTO users VALUES (NULL, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NOW())";
                                 } else {
                                     $user_sql = "/* m_logon::logon */" . "INSERT INTO oa_user VALUES (NULL, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NOW())";
                                 }
diff --git a/code_igniter/application/models/m_logs.php b/code_igniter/application/models/m_logs.php
index e868609c9..87820eb44 100644
--- a/code_igniter/application/models/m_logs.php
+++ b/code_igniter/application/models/m_logs.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 class M_logs extends MY_Model
diff --git a/code_igniter/application/models/m_networks.php b/code_igniter/application/models/m_networks.php
index 382a5f4cf..0e22c53c0 100644
--- a/code_igniter/application/models/m_networks.php
+++ b/code_igniter/application/models/m_networks.php
@@ -28,7 +28,7 @@
  * @author Mark Unwin <marku@opmantek.com>
  *
  *
- * @version   2.0.8
+ * @version   2.0.10
 
  *
  * @copyright Copyright (c) 2014, Opmantek
diff --git a/code_igniter/application/models/m_oa_user.php b/code_igniter/application/models/m_oa_user.php
index 67b7f693f..e464d0611 100644
--- a/code_igniter/application/models/m_oa_user.php
+++ b/code_igniter/application/models/m_oa_user.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 class M_oa_user extends MY_Model
diff --git a/code_igniter/application/models/m_orgs.php b/code_igniter/application/models/m_orgs.php
index 32713ddf4..4353c0015 100644
--- a/code_igniter/application/models/m_orgs.php
+++ b/code_igniter/application/models/m_orgs.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 class M_orgs extends MY_Model
diff --git a/code_igniter/application/models/m_queries.php b/code_igniter/application/models/m_queries.php
index ab7cb88c7..03ae63f18 100644
--- a/code_igniter/application/models/m_queries.php
+++ b/code_igniter/application/models/m_queries.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 class M_queries extends MY_Model
diff --git a/code_igniter/application/models/m_roles.php b/code_igniter/application/models/m_roles.php
index f2d96f90a..b2efccca9 100644
--- a/code_igniter/application/models/m_roles.php
+++ b/code_igniter/application/models/m_roles.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 class M_roles extends MY_Model
diff --git a/code_igniter/application/models/m_scripts.php b/code_igniter/application/models/m_scripts.php
index c88d9ac5b..d1e64f1e7 100644
--- a/code_igniter/application/models/m_scripts.php
+++ b/code_igniter/application/models/m_scripts.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 class M_scripts extends MY_Model
diff --git a/code_igniter/application/models/m_search.php b/code_igniter/application/models/m_search.php
index b144ad19d..5f98db518 100644
--- a/code_igniter/application/models/m_search.php
+++ b/code_igniter/application/models/m_search.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 class M_search extends MY_Model
diff --git a/code_igniter/application/models/m_summaries.php b/code_igniter/application/models/m_summaries.php
index f1fa78b14..54b96cc25 100644
--- a/code_igniter/application/models/m_summaries.php
+++ b/code_igniter/application/models/m_summaries.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 class M_summaries extends MY_Model
diff --git a/code_igniter/application/models/m_tasks.php b/code_igniter/application/models/m_tasks.php
index 4e2b1e9d9..390d4864b 100644
--- a/code_igniter/application/models/m_tasks.php
+++ b/code_igniter/application/models/m_tasks.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 class M_tasks extends MY_Model
diff --git a/code_igniter/application/models/m_users.php b/code_igniter/application/models/m_users.php
index a511d2ca1..c590792bd 100644
--- a/code_igniter/application/models/m_users.php
+++ b/code_igniter/application/models/m_users.php
@@ -28,7 +28,7 @@
  * @author Mark Unwin <marku@opmantek.com>
  *
  *
- * @version   2.0.8
+ * @version   2.0.10
 
  *
  * @copyright Copyright (c) 2014, Opmantek
diff --git a/code_igniter/application/views/theme-bootstrap/v_attributes_collection.php b/code_igniter/application/views/theme-bootstrap/v_attributes_collection.php
index cae750726..9b549073a 100644
--- a/code_igniter/application/views/theme-bootstrap/v_attributes_collection.php
+++ b/code_igniter/application/views/theme-bootstrap/v_attributes_collection.php
@@ -29,7 +29,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_attributes_create_form.php b/code_igniter/application/views/theme-bootstrap/v_attributes_create_form.php
index 8c8bac447..d6cc8ff2c 100644
--- a/code_igniter/application/views/theme-bootstrap/v_attributes_create_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_attributes_create_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_attributes_read.php b/code_igniter/application/views/theme-bootstrap/v_attributes_read.php
index 9fc806ec2..66b3d042b 100644
--- a/code_igniter/application/views/theme-bootstrap/v_attributes_read.php
+++ b/code_igniter/application/views/theme-bootstrap/v_attributes_read.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $item = $this->response->data[0];
diff --git a/code_igniter/application/views/theme-bootstrap/v_attributes_update_form.php b/code_igniter/application/views/theme-bootstrap/v_attributes_update_form.php
index 1afd4ce75..9a8abcd79 100644
--- a/code_igniter/application/views/theme-bootstrap/v_attributes_update_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_attributes_update_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $edit = true;
diff --git a/code_igniter/application/views/theme-bootstrap/v_collection_import_form.php b/code_igniter/application/views/theme-bootstrap/v_collection_import_form.php
index c007cea62..3f5e2932a 100644
--- a/code_igniter/application/views/theme-bootstrap/v_collection_import_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_collection_import_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $item = $this->response->data[0];
diff --git a/code_igniter/application/views/theme-bootstrap/v_configuration_collection.php b/code_igniter/application/views/theme-bootstrap/v_configuration_collection.php
index 10acbd3af..7ed8c7462 100644
--- a/code_igniter/application/views/theme-bootstrap/v_configuration_collection.php
+++ b/code_igniter/application/views/theme-bootstrap/v_configuration_collection.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_configuration_read.php b/code_igniter/application/views/theme-bootstrap/v_configuration_read.php
index 140f98967..ba0adea6e 100644
--- a/code_igniter/application/views/theme-bootstrap/v_configuration_read.php
+++ b/code_igniter/application/views/theme-bootstrap/v_configuration_read.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $item = $this->response->data[0];
diff --git a/code_igniter/application/views/theme-bootstrap/v_configuration_update_form.php b/code_igniter/application/views/theme-bootstrap/v_configuration_update_form.php
index 1f1282514..b250eac33 100644
--- a/code_igniter/application/views/theme-bootstrap/v_configuration_update_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_configuration_update_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $edit = true;
diff --git a/code_igniter/application/views/theme-bootstrap/v_connections_collection.php b/code_igniter/application/views/theme-bootstrap/v_connections_collection.php
index 71267256f..fc5953e65 100644
--- a/code_igniter/application/views/theme-bootstrap/v_connections_collection.php
+++ b/code_igniter/application/views/theme-bootstrap/v_connections_collection.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_connections_create_form.php b/code_igniter/application/views/theme-bootstrap/v_connections_create_form.php
index b8b27d6e1..944e47608 100644
--- a/code_igniter/application/views/theme-bootstrap/v_connections_create_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_connections_create_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_connections_read.php b/code_igniter/application/views/theme-bootstrap/v_connections_read.php
index 29b888945..fb7701c71 100644
--- a/code_igniter/application/views/theme-bootstrap/v_connections_read.php
+++ b/code_igniter/application/views/theme-bootstrap/v_connections_read.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $item = $this->response->data[0];
diff --git a/code_igniter/application/views/theme-bootstrap/v_connections_update_form.php b/code_igniter/application/views/theme-bootstrap/v_connections_update_form.php
index 3b799399a..09f2c7c06 100644
--- a/code_igniter/application/views/theme-bootstrap/v_connections_update_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_connections_update_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $edit = true;
diff --git a/code_igniter/application/views/theme-bootstrap/v_credentials_collection.php b/code_igniter/application/views/theme-bootstrap/v_credentials_collection.php
index 781d5dac6..9218e485d 100644
--- a/code_igniter/application/views/theme-bootstrap/v_credentials_collection.php
+++ b/code_igniter/application/views/theme-bootstrap/v_credentials_collection.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_credentials_create_form.php b/code_igniter/application/views/theme-bootstrap/v_credentials_create_form.php
index 9b6b92d24..57b93f527 100644
--- a/code_igniter/application/views/theme-bootstrap/v_credentials_create_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_credentials_create_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_credentials_read.php b/code_igniter/application/views/theme-bootstrap/v_credentials_read.php
index 37aff6fc9..2f0093902 100644
--- a/code_igniter/application/views/theme-bootstrap/v_credentials_read.php
+++ b/code_igniter/application/views/theme-bootstrap/v_credentials_read.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $item = $this->response->data[0];
diff --git a/code_igniter/application/views/theme-bootstrap/v_credentials_update_form.php b/code_igniter/application/views/theme-bootstrap/v_credentials_update_form.php
index bf7d06c86..d968735a7 100644
--- a/code_igniter/application/views/theme-bootstrap/v_credentials_update_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_credentials_update_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $edit = true;
diff --git a/code_igniter/application/views/theme-bootstrap/v_dashboard_collector.php b/code_igniter/application/views/theme-bootstrap/v_dashboard_collector.php
index cba3f0d8a..c9372711c 100644
--- a/code_igniter/application/views/theme-bootstrap/v_dashboard_collector.php
+++ b/code_igniter/application/views/theme-bootstrap/v_dashboard_collector.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 foreach ($tasks as $task) {
diff --git a/code_igniter/application/views/theme-bootstrap/v_database_collection.php b/code_igniter/application/views/theme-bootstrap/v_database_collection.php
index 06f895ed5..525856827 100644
--- a/code_igniter/application/views/theme-bootstrap/v_database_collection.php
+++ b/code_igniter/application/views/theme-bootstrap/v_database_collection.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_database_read.php b/code_igniter/application/views/theme-bootstrap/v_database_read.php
index b601214ab..ad8cd7010 100644
--- a/code_igniter/application/views/theme-bootstrap/v_database_read.php
+++ b/code_igniter/application/views/theme-bootstrap/v_database_read.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $item = $this->response->data[0];
diff --git a/code_igniter/application/views/theme-bootstrap/v_database_update.php b/code_igniter/application/views/theme-bootstrap/v_database_update.php
index 9f291f33a..487af8ba6 100644
--- a/code_igniter/application/views/theme-bootstrap/v_database_update.php
+++ b/code_igniter/application/views/theme-bootstrap/v_database_update.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_database_update_form.php b/code_igniter/application/views/theme-bootstrap/v_database_update_form.php
index 865c40868..e418a27f2 100644
--- a/code_igniter/application/views/theme-bootstrap/v_database_update_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_database_update_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 if (php_uname('s') == "Windows NT") {
diff --git a/code_igniter/application/views/theme-bootstrap/v_devices_bulk_update_form.php b/code_igniter/application/views/theme-bootstrap/v_devices_bulk_update_form.php
index d6e760899..adb3ac022 100644
--- a/code_igniter/application/views/theme-bootstrap/v_devices_bulk_update_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_devices_bulk_update_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $fields = explode(' ', 'asset_number attached_system_id class cluster_name cluster_type comments contact_name description dns_domain dns_hostname domain environment form_factor fqdn function hostname ip lease_expiry_date locations location_latitude location_level location_longitude location_rack location_rack_position location_rack_size location_room location_suite manufacturer model name nmis_export nmis_group nmis_name nmis_role oae_manage orgs os_bit os_family os_group os_installation_date os_name os_version owner patch_panel patch_panel_port printer_color purchase_amount purchase_cost_center purchase_date purchase_invoice purchase_order_number purchase_service_contract_number purchase_vendor serial serial_imei serial_sim service_network service_number service_plan service_provider service_type status switch_port switch_system_id types unlock_pin uuid vm_group vm_server_name wall_port warranty_duration warranty_expires warranty_type');
diff --git a/code_igniter/application/views/theme-bootstrap/v_devices_collection.php b/code_igniter/application/views/theme-bootstrap/v_devices_collection.php
index 0f137bce7..0b3b9e835 100644
--- a/code_igniter/application/views/theme-bootstrap/v_devices_collection.php
+++ b/code_igniter/application/views/theme-bootstrap/v_devices_collection.php
@@ -28,7 +28,7 @@
  * @author Mark Unwin <marku@opmantek.com>
  *
  *
- * @version   2.0.8
+ * @version   2.0.10
 
  *
  * @copyright Copyright (c) 2014, Opmantek
diff --git a/code_igniter/application/views/theme-bootstrap/v_devices_create_form.php b/code_igniter/application/views/theme-bootstrap/v_devices_create_form.php
index 48513ca23..697a141b0 100644
--- a/code_igniter/application/views/theme-bootstrap/v_devices_create_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_devices_create_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
@@ -102,7 +102,13 @@
                         </div>
                     </div>
                     <div class="form-group">
-                        <label for="data[attributes][status]" class="col-sm-3 control-label"><?php echo __('xStatusxx'); ?></label>
+                        <label for="data[attributes][netmask]" class="col-sm-3 control-label"><?php echo __('Netmask'); ?></label>
+                        <div class="col-sm-8 input-group">
+                            <input type="text" class="form-control" id="data[attributes][netmask]" name="data[attributes][netmask]" value="255.255.255.0">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="data[attributes][status]" class="col-sm-3 control-label"><?php echo __('Status'); ?></label>
                         <div class="col-sm-8 input-group">
                             <select class="form-control" id="data[attributes][status]" name="data[attributes][status]">
                             <?php
diff --git a/code_igniter/application/views/theme-bootstrap/v_devices_create_form_attachment.php b/code_igniter/application/views/theme-bootstrap/v_devices_create_form_attachment.php
index b22f5a2ef..51db76fc4 100644
--- a/code_igniter/application/views/theme-bootstrap/v_devices_create_form_attachment.php
+++ b/code_igniter/application/views/theme-bootstrap/v_devices_create_form_attachment.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_devices_create_form_credentials.php b/code_igniter/application/views/theme-bootstrap/v_devices_create_form_credentials.php
index d399b3cfe..845a64da2 100644
--- a/code_igniter/application/views/theme-bootstrap/v_devices_create_form_credentials.php
+++ b/code_igniter/application/views/theme-bootstrap/v_devices_create_form_credentials.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_devices_import_form.php b/code_igniter/application/views/theme-bootstrap/v_devices_import_form.php
index 6bef20dbc..b7b0ba689 100644
--- a/code_igniter/application/views/theme-bootstrap/v_devices_import_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_devices_import_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $item = $this->response->data[0];
diff --git a/code_igniter/application/views/theme-bootstrap/v_devices_read.php b/code_igniter/application/views/theme-bootstrap/v_devices_read.php
index 6c32ccb7d..0e2255aef 100644
--- a/code_igniter/application/views/theme-bootstrap/v_devices_read.php
+++ b/code_igniter/application/views/theme-bootstrap/v_devices_read.php
@@ -31,7 +31,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
@@ -320,7 +320,7 @@
                         </div>
 
                         <div class="form-group">
-                            <label for="hostname" class="col-sm-4 control-label"><?php echo __('Hostame')?></label>
+                            <label for="hostname" class="col-sm-4 control-label"><?php echo __('Hostname')?></label>
                             <div class="col-sm-8 input-group">
                                 <input disabled type="text" class="form-control"  id="hostname" name="hostname" value="<?php echo $data['system']->hostname; ?>">
                                 <?php if ($edit) { ?><span class="input-group-btn">
@@ -344,7 +344,7 @@
                         </div>
 
                         <div class="form-group">
-                            <label for="dns_hostname" class="col-sm-4 control-label"><?php echo __('DNS Hostame')?></label>
+                            <label for="dns_hostname" class="col-sm-4 control-label"><?php echo __('DNS Hostname')?></label>
                             <div class="col-sm-8 input-group">
                               <input disabled type="text" class="form-control"  id="dns_hostname" name="dns_hostname" value="<?php echo $data['system']->dns_hostname; ?>">
                                 <?php if ($edit) { ?><span class="input-group-btn">
@@ -994,7 +994,7 @@
                     <td><?php echo htmlspecialchars($item->name, REPLACE_FLAGS, CHARSET); ?></td>
                     <td><?php echo htmlspecialchars($item->description, REPLACE_FLAGS, CHARSET); ?></td>
                     <?php if ($this->m_users->get_user_permission('', 'credentials', 'd')) { ?>
-                    <td style="text-align:center;"><button type="button" class="btn btn-sm btn-danger" aria-label="Left Align" ><span class="glyphicon glyphicon-trash subresource_delete_link" data-sub-resource-id="<?php echo intval($item->id); ?>" data-sub-resource="credential" data-name="<?php echo htmlspecialchars($item->name, REPLACE_FLAGS, CHARSET); ?>" aria-hidden="true"></span></button></td>
+                    <td style="text-align:center;"><button type="button" class="btn btn-sm btn-danger subresource_delete_link" aria-label="Left Align" data-sub-resource-id="<?php echo intval($item->id); ?>" data-sub-resource="credential" data-name="<?php echo htmlspecialchars($item->name, REPLACE_FLAGS, CHARSET); ?>"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span></button></td>
                     <?php } ?>
                 <?php } ?>
                 </tbody>
@@ -1825,7 +1825,6 @@ function insert_additional_fields($section = '', $additional_fields = array(), $
                     }
                     echo "                          <option value=\"" . $value . "\"" . $selected . ">".__("$value")."</option>\n";
                 }
-
                 echo '                        </select>';
                 if ($edit) {
                     echo '
@@ -1839,6 +1838,22 @@ function insert_additional_fields($section = '', $additional_fields = array(), $
                     </div>
                 </div>' . "\n";
             }
+
+            if ($field->{'type'} == 'date') {
+                echo '                    <div class="form-group">
+                    <label for="' . $name . '" class="col-sm-4 control-label">' . $field->{'name'} . '</label>
+                    <div class="col-sm-8 input-group">
+                      <input disabled type="date" class="form-control"  id="' . $name . '" name="' . $name . '" value="' . $field->{'value'} . '">';
+                if ($edit) {
+                    echo '
+                      <span class="input-group-btn">
+                        <button id="edit_' . $name . '" data-action="edit" class="btn btn-default edit_button" type="button" data-attribute="' . $name . '"><span class="glyphicon glyphicon-edit" aria-hidden="true"></span></button>
+                      </span>';
+                }
+                    echo '
+                    </div>
+                </div>' . "\n";
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/code_igniter/application/views/theme-bootstrap/v_devices_read_partition_graph.php b/code_igniter/application/views/theme-bootstrap/v_devices_read_partition_graph.php
index 232cc7b3e..af60b59f1 100644
--- a/code_igniter/application/views/theme-bootstrap/v_devices_read_partition_graph.php
+++ b/code_igniter/application/views/theme-bootstrap/v_devices_read_partition_graph.php
@@ -28,7 +28,7 @@
  * @author Mark Unwin <marku@opmantek.com>
  *
  *
- * @version   2.0.8
+ * @version   2.0.10
  *
  * @copyright Copyright (c) 2014, Opmantek
  * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
diff --git a/code_igniter/application/views/theme-bootstrap/v_devices_sub_resource_read.php b/code_igniter/application/views/theme-bootstrap/v_devices_sub_resource_read.php
index 5c80a4a89..89f28ccef 100644
--- a/code_igniter/application/views/theme-bootstrap/v_devices_sub_resource_read.php
+++ b/code_igniter/application/views/theme-bootstrap/v_devices_sub_resource_read.php
@@ -28,7 +28,7 @@
  * @author Mark Unwin <marku@opmantek.com>
  *
  *
- * @version   2.0.8
+ * @version   2.0.10
  *
  * @copyright Copyright (c) 2014, Opmantek
  * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
diff --git a/code_igniter/application/views/theme-bootstrap/v_discoveries_collection.php b/code_igniter/application/views/theme-bootstrap/v_discoveries_collection.php
index e982e1a00..896c9fb10 100644
--- a/code_igniter/application/views/theme-bootstrap/v_discoveries_collection.php
+++ b/code_igniter/application/views/theme-bootstrap/v_discoveries_collection.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_discoveries_create_form.php b/code_igniter/application/views/theme-bootstrap/v_discoveries_create_form.php
index acc99b3b3..aa65ff2b3 100644
--- a/code_igniter/application/views/theme-bootstrap/v_discoveries_create_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_discoveries_create_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/views/theme-bootstrap/v_discoveries_create_single.php b/code_igniter/application/views/theme-bootstrap/v_discoveries_create_single.php
index b31510c59..f291e87fb 100644
--- a/code_igniter/application/views/theme-bootstrap/v_discoveries_create_single.php
+++ b/code_igniter/application/views/theme-bootstrap/v_discoveries_create_single.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/views/theme-bootstrap/v_discoveries_read.php b/code_igniter/application/views/theme-bootstrap/v_discoveries_read.php
index bdcd38d51..51003e126 100644
--- a/code_igniter/application/views/theme-bootstrap/v_discoveries_read.php
+++ b/code_igniter/application/views/theme-bootstrap/v_discoveries_read.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $item = $this->response->data[0];
diff --git a/code_igniter/application/views/theme-bootstrap/v_discoveries_update_form.php b/code_igniter/application/views/theme-bootstrap/v_discoveries_update_form.php
index 8c27095e7..e3abc32d4 100644
--- a/code_igniter/application/views/theme-bootstrap/v_discoveries_update_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_discoveries_update_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $edit = true;
diff --git a/code_igniter/application/views/theme-bootstrap/v_error.php b/code_igniter/application/views/theme-bootstrap/v_error.php
index 273fb8abd..ae0d3831f 100644
--- a/code_igniter/application/views/theme-bootstrap/v_error.php
+++ b/code_igniter/application/views/theme-bootstrap/v_error.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 // echo "<h2>Error</h2>\n";
diff --git a/code_igniter/application/views/theme-bootstrap/v_errors_collection.php b/code_igniter/application/views/theme-bootstrap/v_errors_collection.php
index 2085b126a..1103198e2 100644
--- a/code_igniter/application/views/theme-bootstrap/v_errors_collection.php
+++ b/code_igniter/application/views/theme-bootstrap/v_errors_collection.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_errors_read.php b/code_igniter/application/views/theme-bootstrap/v_errors_read.php
index 117c625c1..c20030d7d 100644
--- a/code_igniter/application/views/theme-bootstrap/v_errors_read.php
+++ b/code_igniter/application/views/theme-bootstrap/v_errors_read.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $item = $this->response->data[0];
diff --git a/code_igniter/application/views/theme-bootstrap/v_fields_collection.php b/code_igniter/application/views/theme-bootstrap/v_fields_collection.php
index b7a47de1b..fd9966f10 100644
--- a/code_igniter/application/views/theme-bootstrap/v_fields_collection.php
+++ b/code_igniter/application/views/theme-bootstrap/v_fields_collection.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_fields_create_form.php b/code_igniter/application/views/theme-bootstrap/v_fields_create_form.php
index ca9766a57..b2122d61e 100644
--- a/code_igniter/application/views/theme-bootstrap/v_fields_create_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_fields_create_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
@@ -75,6 +75,7 @@
                             <select class="data_type form-control" id="data[attributes][type]" name="data[attributes][type]">
                                 <option value="varchar"><?php echo __('VarChar'); ?></option>
                                 <option value="list"><?php echo __('List'); ?></option>
+                                <option value="date"><?php echo __('Date'); ?></option>
                             </select>
                         </div>
                     </div>
@@ -145,7 +146,7 @@
 $(document).ready(function(){
     $('.data_type').change(function() {
         var $type = $(this).val();
-        if ($type == "varchar") {
+        if ($type == "varchar" || $type == "date") {
             $(".data-values").prop('disabled', true);
         } else {
             $(".data-values").prop('disabled', false);
diff --git a/code_igniter/application/views/theme-bootstrap/v_fields_read.php b/code_igniter/application/views/theme-bootstrap/v_fields_read.php
index cd52386c5..014b3c03d 100644
--- a/code_igniter/application/views/theme-bootstrap/v_fields_read.php
+++ b/code_igniter/application/views/theme-bootstrap/v_fields_read.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $item = $this->response->data[0];
@@ -88,6 +88,7 @@
                             <select class="data_type form-control" id="type" name="type" disabled>
                                 <option value="varchar"<?php if ($item->attributes->type == 'varchar') { echo " selected"; } ?>><?php echo __('VarChar'); ?></option>
                                 <option value="list"<?php if ($item->attributes->type == 'list') { echo " selected"; } ?>><?php echo __('List'); ?></option>
+                                <option value="date"<?php if ($item->attributes->type == 'date') { echo " selected"; } ?>><?php echo __('Date'); ?></option>
                             </select>
                             <?php if (!empty($edit)) { ?>
                             <span class="input-group-btn">
diff --git a/code_igniter/application/views/theme-bootstrap/v_fields_update_form.php b/code_igniter/application/views/theme-bootstrap/v_fields_update_form.php
index 287e99db1..1cd15eb75 100644
--- a/code_igniter/application/views/theme-bootstrap/v_fields_update_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_fields_update_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $edit = true;
diff --git a/code_igniter/application/views/theme-bootstrap/v_groups_collection.php b/code_igniter/application/views/theme-bootstrap/v_groups_collection.php
index 747ca58a0..871083d18 100644
--- a/code_igniter/application/views/theme-bootstrap/v_groups_collection.php
+++ b/code_igniter/application/views/theme-bootstrap/v_groups_collection.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_groups_create_form.php b/code_igniter/application/views/theme-bootstrap/v_groups_create_form.php
index 45133ff61..6ced279da 100644
--- a/code_igniter/application/views/theme-bootstrap/v_groups_create_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_groups_create_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_groups_read.php b/code_igniter/application/views/theme-bootstrap/v_groups_read.php
index d5792012d..5db0aeeaa 100644
--- a/code_igniter/application/views/theme-bootstrap/v_groups_read.php
+++ b/code_igniter/application/views/theme-bootstrap/v_groups_read.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $item = $this->response->data[0];
diff --git a/code_igniter/application/views/theme-bootstrap/v_groups_update_form.php b/code_igniter/application/views/theme-bootstrap/v_groups_update_form.php
index d2a10ca88..04525e34d 100644
--- a/code_igniter/application/views/theme-bootstrap/v_groups_update_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_groups_update_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $edit = true;
diff --git a/code_igniter/application/views/theme-bootstrap/v_help_enterprise.php b/code_igniter/application/views/theme-bootstrap/v_help_enterprise.php
index 0e61d5645..3e832ef83 100644
--- a/code_igniter/application/views/theme-bootstrap/v_help_enterprise.php
+++ b/code_igniter/application/views/theme-bootstrap/v_help_enterprise.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_help_groups.php b/code_igniter/application/views/theme-bootstrap/v_help_groups.php
index e508ff601..36ca14e45 100644
--- a/code_igniter/application/views/theme-bootstrap/v_help_groups.php
+++ b/code_igniter/application/views/theme-bootstrap/v_help_groups.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_help_index.php b/code_igniter/application/views/theme-bootstrap/v_help_index.php
index 6b9869573..a4f14ac6e 100644
--- a/code_igniter/application/views/theme-bootstrap/v_help_index.php
+++ b/code_igniter/application/views/theme-bootstrap/v_help_index.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 if (php_uname('s') == "Windows NT") {
diff --git a/code_igniter/application/views/theme-bootstrap/v_help_queries.php b/code_igniter/application/views/theme-bootstrap/v_help_queries.php
index 96f605a09..d55585cef 100644
--- a/code_igniter/application/views/theme-bootstrap/v_help_queries.php
+++ b/code_igniter/application/views/theme-bootstrap/v_help_queries.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_help_roles.php b/code_igniter/application/views/theme-bootstrap/v_help_roles.php
index 5362a8572..7c9030cfc 100644
--- a/code_igniter/application/views/theme-bootstrap/v_help_roles.php
+++ b/code_igniter/application/views/theme-bootstrap/v_help_roles.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_help_statistics.php b/code_igniter/application/views/theme-bootstrap/v_help_statistics.php
index 6b9869573..a4f14ac6e 100644
--- a/code_igniter/application/views/theme-bootstrap/v_help_statistics.php
+++ b/code_igniter/application/views/theme-bootstrap/v_help_statistics.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 if (php_uname('s') == "Windows NT") {
diff --git a/code_igniter/application/views/theme-bootstrap/v_help_summaries.php b/code_igniter/application/views/theme-bootstrap/v_help_summaries.php
index c7d8ce3d7..577bc962c 100644
--- a/code_igniter/application/views/theme-bootstrap/v_help_summaries.php
+++ b/code_igniter/application/views/theme-bootstrap/v_help_summaries.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_help_support.php b/code_igniter/application/views/theme-bootstrap/v_help_support.php
index 2dfe5e1f1..8ec28bff8 100644
--- a/code_igniter/application/views/theme-bootstrap/v_help_support.php
+++ b/code_igniter/application/views/theme-bootstrap/v_help_support.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 if (php_uname('s') == 'Windows NT') {
diff --git a/code_igniter/application/views/theme-bootstrap/v_input_devices_create_form.php b/code_igniter/application/views/theme-bootstrap/v_input_devices_create_form.php
index d90517f9d..8096bdcc1 100644
--- a/code_igniter/application/views/theme-bootstrap/v_input_devices_create_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_input_devices_create_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_input_discoveries_create_form.php b/code_igniter/application/views/theme-bootstrap/v_input_discoveries_create_form.php
index fb8ef10e6..6e83defd6 100644
--- a/code_igniter/application/views/theme-bootstrap/v_input_discoveries_create_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_input_discoveries_create_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_lang.php b/code_igniter/application/views/theme-bootstrap/v_lang.php
index 86895de83..ba8d0f5aa 100644
--- a/code_igniter/application/views/theme-bootstrap/v_lang.php
+++ b/code_igniter/application/views/theme-bootstrap/v_lang.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 if (!isset($this->user->lang) or $this->user->lang == "") {
diff --git a/code_igniter/application/views/theme-bootstrap/v_ldap_servers_collection.php b/code_igniter/application/views/theme-bootstrap/v_ldap_servers_collection.php
index f8e1e3e07..39b81a264 100644
--- a/code_igniter/application/views/theme-bootstrap/v_ldap_servers_collection.php
+++ b/code_igniter/application/views/theme-bootstrap/v_ldap_servers_collection.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_ldap_servers_create_form.php b/code_igniter/application/views/theme-bootstrap/v_ldap_servers_create_form.php
index 7c504d2b0..26c227c39 100644
--- a/code_igniter/application/views/theme-bootstrap/v_ldap_servers_create_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_ldap_servers_create_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
@@ -188,7 +188,7 @@
                     <div class="form-group">
                         <label for="data[attributes][dn_password]" class="col-sm-3 control-label"><?php echo __('DN Password'); ?></label>
                         <div class="col-sm-8 input-group">
-                             <input type="text" class="form-control" id="data[attributes][dn_password]" name="data[attributes][dn_password]" placeholder="your DN Account password" value="">
+                             <input type="password" class="form-control" id="data[attributes][dn_password]" name="data[attributes][dn_password]" placeholder="your DN Account password" value="">
                         </div>
                     </div>
 
diff --git a/code_igniter/application/views/theme-bootstrap/v_ldap_servers_read.php b/code_igniter/application/views/theme-bootstrap/v_ldap_servers_read.php
index 825fbdbfd..8e1517e8b 100644
--- a/code_igniter/application/views/theme-bootstrap/v_ldap_servers_read.php
+++ b/code_igniter/application/views/theme-bootstrap/v_ldap_servers_read.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $item = $this->response->data[0];
diff --git a/code_igniter/application/views/theme-bootstrap/v_ldap_servers_update_form.php b/code_igniter/application/views/theme-bootstrap/v_ldap_servers_update_form.php
index 96c233377..d04e3f689 100644
--- a/code_igniter/application/views/theme-bootstrap/v_ldap_servers_update_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_ldap_servers_update_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $edit = true;
diff --git a/code_igniter/application/views/theme-bootstrap/v_licenses_collection.php b/code_igniter/application/views/theme-bootstrap/v_licenses_collection.php
index 943760394..b960ac50e 100644
--- a/code_igniter/application/views/theme-bootstrap/v_licenses_collection.php
+++ b/code_igniter/application/views/theme-bootstrap/v_licenses_collection.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_licenses_create_form.php b/code_igniter/application/views/theme-bootstrap/v_licenses_create_form.php
index bebea8024..cb9587b2d 100644
--- a/code_igniter/application/views/theme-bootstrap/v_licenses_create_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_licenses_create_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_licenses_read.php b/code_igniter/application/views/theme-bootstrap/v_licenses_read.php
index 7037fae4f..995c8fe7d 100644
--- a/code_igniter/application/views/theme-bootstrap/v_licenses_read.php
+++ b/code_igniter/application/views/theme-bootstrap/v_licenses_read.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $item = $this->response->data[0];
diff --git a/code_igniter/application/views/theme-bootstrap/v_licenses_update_form.php b/code_igniter/application/views/theme-bootstrap/v_licenses_update_form.php
index a28de40f2..abf9d21e1 100644
--- a/code_igniter/application/views/theme-bootstrap/v_licenses_update_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_licenses_update_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $edit = true;
diff --git a/code_igniter/application/views/theme-bootstrap/v_locations_collection.php b/code_igniter/application/views/theme-bootstrap/v_locations_collection.php
index e8e23b3a6..429ec1bf1 100644
--- a/code_igniter/application/views/theme-bootstrap/v_locations_collection.php
+++ b/code_igniter/application/views/theme-bootstrap/v_locations_collection.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_locations_create_form.php b/code_igniter/application/views/theme-bootstrap/v_locations_create_form.php
index 18628bb2e..c99767369 100644
--- a/code_igniter/application/views/theme-bootstrap/v_locations_create_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_locations_create_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_locations_read.php b/code_igniter/application/views/theme-bootstrap/v_locations_read.php
index 16a5ad6d7..96773e4b0 100644
--- a/code_igniter/application/views/theme-bootstrap/v_locations_read.php
+++ b/code_igniter/application/views/theme-bootstrap/v_locations_read.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $item = $this->response->data[0];
diff --git a/code_igniter/application/views/theme-bootstrap/v_locations_update_form.php b/code_igniter/application/views/theme-bootstrap/v_locations_update_form.php
index 828c26fab..2c0232cf0 100644
--- a/code_igniter/application/views/theme-bootstrap/v_locations_update_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_locations_update_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $edit = true;
diff --git a/code_igniter/application/views/theme-bootstrap/v_logs_collection.php b/code_igniter/application/views/theme-bootstrap/v_logs_collection.php
index 1eda694df..4ba98ba4d 100644
--- a/code_igniter/application/views/theme-bootstrap/v_logs_collection.php
+++ b/code_igniter/application/views/theme-bootstrap/v_logs_collection.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_logs_read.php b/code_igniter/application/views/theme-bootstrap/v_logs_read.php
index 01a9d038f..36010662a 100644
--- a/code_igniter/application/views/theme-bootstrap/v_logs_read.php
+++ b/code_igniter/application/views/theme-bootstrap/v_logs_read.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $item = $this->response->data[0];
diff --git a/code_igniter/application/views/theme-bootstrap/v_networks_collection.php b/code_igniter/application/views/theme-bootstrap/v_networks_collection.php
index dc966972e..fd3569df0 100644
--- a/code_igniter/application/views/theme-bootstrap/v_networks_collection.php
+++ b/code_igniter/application/views/theme-bootstrap/v_networks_collection.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_networks_create_form.php b/code_igniter/application/views/theme-bootstrap/v_networks_create_form.php
index 405c0cd91..51f20ec2f 100644
--- a/code_igniter/application/views/theme-bootstrap/v_networks_create_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_networks_create_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_networks_read.php b/code_igniter/application/views/theme-bootstrap/v_networks_read.php
index 2bd647707..5010bace8 100644
--- a/code_igniter/application/views/theme-bootstrap/v_networks_read.php
+++ b/code_igniter/application/views/theme-bootstrap/v_networks_read.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $item = $this->response->data[0];
diff --git a/code_igniter/application/views/theme-bootstrap/v_networks_update_form.php b/code_igniter/application/views/theme-bootstrap/v_networks_update_form.php
index 4257c5ffa..cd47ad265 100644
--- a/code_igniter/application/views/theme-bootstrap/v_networks_update_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_networks_update_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $edit = true;
diff --git a/code_igniter/application/views/theme-bootstrap/v_nmis_collection.php b/code_igniter/application/views/theme-bootstrap/v_nmis_collection.php
index cc2751702..810a1ff6c 100644
--- a/code_igniter/application/views/theme-bootstrap/v_nmis_collection.php
+++ b/code_igniter/application/views/theme-bootstrap/v_nmis_collection.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $refine_link = $_SERVER["REQUEST_URI"];
diff --git a/code_igniter/application/views/theme-bootstrap/v_nmis_create_form.php b/code_igniter/application/views/theme-bootstrap/v_nmis_create_form.php
index a9eb07887..fcd780314 100644
--- a/code_igniter/application/views/theme-bootstrap/v_nmis_create_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_nmis_create_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_nmis_export.php b/code_igniter/application/views/theme-bootstrap/v_nmis_export.php
index ee80bdfdc..b5af2be7c 100644
--- a/code_igniter/application/views/theme-bootstrap/v_nmis_export.php
+++ b/code_igniter/application/views/theme-bootstrap/v_nmis_export.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_orgs_collection.php b/code_igniter/application/views/theme-bootstrap/v_orgs_collection.php
index 1695ea534..f5b14503c 100644
--- a/code_igniter/application/views/theme-bootstrap/v_orgs_collection.php
+++ b/code_igniter/application/views/theme-bootstrap/v_orgs_collection.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_orgs_create_form.php b/code_igniter/application/views/theme-bootstrap/v_orgs_create_form.php
index 2d0cc445e..fb5849161 100644
--- a/code_igniter/application/views/theme-bootstrap/v_orgs_create_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_orgs_create_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_orgs_read.php b/code_igniter/application/views/theme-bootstrap/v_orgs_read.php
index 66fa716e6..75fbe85d3 100644
--- a/code_igniter/application/views/theme-bootstrap/v_orgs_read.php
+++ b/code_igniter/application/views/theme-bootstrap/v_orgs_read.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $item = $this->response->data[0];
diff --git a/code_igniter/application/views/theme-bootstrap/v_orgs_update_form.php b/code_igniter/application/views/theme-bootstrap/v_orgs_update_form.php
index cfeb74693..5b4ae8272 100644
--- a/code_igniter/application/views/theme-bootstrap/v_orgs_update_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_orgs_update_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $edit = true;
diff --git a/code_igniter/application/views/theme-bootstrap/v_queries_collection.php b/code_igniter/application/views/theme-bootstrap/v_queries_collection.php
index 9a6469fc1..e36c07aad 100644
--- a/code_igniter/application/views/theme-bootstrap/v_queries_collection.php
+++ b/code_igniter/application/views/theme-bootstrap/v_queries_collection.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_queries_create_form.php b/code_igniter/application/views/theme-bootstrap/v_queries_create_form.php
index 85fe2d71b..08064dab9 100644
--- a/code_igniter/application/views/theme-bootstrap/v_queries_create_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_queries_create_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_queries_execute.php b/code_igniter/application/views/theme-bootstrap/v_queries_execute.php
index 55008e0b7..93ccb02f1 100644
--- a/code_igniter/application/views/theme-bootstrap/v_queries_execute.php
+++ b/code_igniter/application/views/theme-bootstrap/v_queries_execute.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/views/theme-bootstrap/v_queries_read.php b/code_igniter/application/views/theme-bootstrap/v_queries_read.php
index 994abf236..79c8b021e 100644
--- a/code_igniter/application/views/theme-bootstrap/v_queries_read.php
+++ b/code_igniter/application/views/theme-bootstrap/v_queries_read.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $item = $this->response->data[0];
diff --git a/code_igniter/application/views/theme-bootstrap/v_queries_update_form.php b/code_igniter/application/views/theme-bootstrap/v_queries_update_form.php
index e3ecd1df6..ba8474a16 100644
--- a/code_igniter/application/views/theme-bootstrap/v_queries_update_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_queries_update_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $edit = true;
diff --git a/code_igniter/application/views/theme-bootstrap/v_roles_collection.php b/code_igniter/application/views/theme-bootstrap/v_roles_collection.php
index 2569e2f3c..80da0f571 100644
--- a/code_igniter/application/views/theme-bootstrap/v_roles_collection.php
+++ b/code_igniter/application/views/theme-bootstrap/v_roles_collection.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_roles_read.php b/code_igniter/application/views/theme-bootstrap/v_roles_read.php
index 757ab0d2b..00d11f755 100644
--- a/code_igniter/application/views/theme-bootstrap/v_roles_read.php
+++ b/code_igniter/application/views/theme-bootstrap/v_roles_read.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $item = $this->response->data[0];
diff --git a/code_igniter/application/views/theme-bootstrap/v_scripts_collection.php b/code_igniter/application/views/theme-bootstrap/v_scripts_collection.php
index e4fe089c3..8711b53d1 100644
--- a/code_igniter/application/views/theme-bootstrap/v_scripts_collection.php
+++ b/code_igniter/application/views/theme-bootstrap/v_scripts_collection.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_scripts_create_form.php b/code_igniter/application/views/theme-bootstrap/v_scripts_create_form.php
index dcc419be1..0e41b973a 100644
--- a/code_igniter/application/views/theme-bootstrap/v_scripts_create_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_scripts_create_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 foreach ($this->response->included as $item) {
diff --git a/code_igniter/application/views/theme-bootstrap/v_scripts_read.php b/code_igniter/application/views/theme-bootstrap/v_scripts_read.php
index 0379aa23e..2d1496229 100644
--- a/code_igniter/application/views/theme-bootstrap/v_scripts_read.php
+++ b/code_igniter/application/views/theme-bootstrap/v_scripts_read.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $item = $this->response->data[0];
@@ -131,6 +131,14 @@
     </div>
 
 
+    <?php
+    foreach ($this->response->included as $option) {
+        if (!empty($option->type) and $option->type == 'script_option' and $option->id == $item->attributes->based_on) {
+            $script_options = $option->attributes;
+            break;
+        }
+    }
+    ?>
     <div class="row">
         <div class="col-md-6">
             <div class="panel panel-default">
@@ -141,23 +149,33 @@
                     </h3>
                 </div>
                 <div class="panel-body">
-                <?php if (!empty($item->attributes->options)) { ?>
-                    <?php foreach ($item->attributes->options as $key => $value) { ?>
-                    <?php if ($key != 'files') { ?>
+                <?php
+                foreach ($script_options as $script_option) {
+                    $option_value = '';
+                    foreach ($this->response->included as $option) {
+                        if ($option->id == $script_option) {
+                            foreach ($item->attributes->options as $key => $value) {
+                                if ($key == $script_option) {
+                                    $option_value = $value;
+                                }
+                            }
+                        }
+                    }
+                ?>
                     <div class="form-group">
-                        <label for="edited_date" class="col-md-4 control-label"><?php echo htmlspecialchars($key, REPLACE_FLAGS, CHARSET); ?></label>
+                        <label for="<?php echo htmlspecialchars($script_option, REPLACE_FLAGS, CHARSET); ?>" class="col-md-4 control-label"><?php echo htmlspecialchars($script_option, REPLACE_FLAGS, CHARSET); ?></label>
                         <div class="col-sm-7 input-group">
-                            <input type="text" class="form-control" id="options.<?php echo htmlspecialchars($key, REPLACE_FLAGS, CHARSET); ?>" title="options.<?php echo htmlspecialchars($key, REPLACE_FLAGS, CHARSET); ?>" name="options.<?php echo htmlspecialchars($key, REPLACE_FLAGS, CHARSET); ?>" value="<?php echo htmlspecialchars($value, REPLACE_FLAGS, CHARSET); ?>" disabled>
+                            <input type="text" class="form-control" id="options.<?php echo htmlspecialchars($script_option, REPLACE_FLAGS, CHARSET); ?>" title="options.<?php echo htmlspecialchars($script_option, REPLACE_FLAGS, CHARSET); ?>" name="options.<?php echo htmlspecialchars($script_option, REPLACE_FLAGS, CHARSET); ?>" value="<?php echo htmlspecialchars($option_value, REPLACE_FLAGS, CHARSET); ?>" disabled>
                             <?php if (!empty($edit)) { ?>
                             <span class="input-group-btn">
-                                <button id="edit_options.<?php echo htmlspecialchars($key, REPLACE_FLAGS, CHARSET); ?>" data-action="edit" class="btn btn-default edit_button" type="button" data-attribute="options.<?php echo htmlspecialchars($key, REPLACE_FLAGS, CHARSET); ?>"><span class="glyphicon glyphicon-edit" aria-hidden="true"></span></button>
+                                <button id="edit_options.<?php echo htmlspecialchars($script_option, REPLACE_FLAGS, CHARSET); ?>" data-action="edit" class="btn btn-default edit_button" type="button" data-attribute="options.<?php echo htmlspecialchars($script_option, REPLACE_FLAGS, CHARSET); ?>"><span class="glyphicon glyphicon-edit" aria-hidden="true"></span></button>
                             </span>
                             <?php } ?>
                         </div>
                     </div>
-                    <?php } ?>
-                    <?php } ?>
-                <?php } ?>
+                <?php
+                }
+                ?>
                 </div>
             </div>
         </div>
diff --git a/code_igniter/application/views/theme-bootstrap/v_scripts_update_form.php b/code_igniter/application/views/theme-bootstrap/v_scripts_update_form.php
index 4d114a016..05d18e1fa 100644
--- a/code_igniter/application/views/theme-bootstrap/v_scripts_update_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_scripts_update_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $edit = true;
diff --git a/code_igniter/application/views/theme-bootstrap/v_search_create.php b/code_igniter/application/views/theme-bootstrap/v_search_create.php
index 0408a272e..35e319d87 100644
--- a/code_igniter/application/views/theme-bootstrap/v_search_create.php
+++ b/code_igniter/application/views/theme-bootstrap/v_search_create.php
@@ -28,7 +28,7 @@
  * @author Mark Unwin <marku@opmantek.com>
  *
  *
- * @version   2.0.8
+ * @version   2.0.10
  *
  * @copyright Copyright (c) 2014, Opmantek
  * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
diff --git a/code_igniter/application/views/theme-bootstrap/v_summaries_collection.php b/code_igniter/application/views/theme-bootstrap/v_summaries_collection.php
index 17a90f9b5..52e32d30e 100644
--- a/code_igniter/application/views/theme-bootstrap/v_summaries_collection.php
+++ b/code_igniter/application/views/theme-bootstrap/v_summaries_collection.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_summaries_create_form.php b/code_igniter/application/views/theme-bootstrap/v_summaries_create_form.php
index 994366d34..eddb0252e 100644
--- a/code_igniter/application/views/theme-bootstrap/v_summaries_create_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_summaries_create_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_summaries_execute.php b/code_igniter/application/views/theme-bootstrap/v_summaries_execute.php
index f769e382b..dd8821087 100644
--- a/code_igniter/application/views/theme-bootstrap/v_summaries_execute.php
+++ b/code_igniter/application/views/theme-bootstrap/v_summaries_execute.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_summaries_read.php b/code_igniter/application/views/theme-bootstrap/v_summaries_read.php
index c2ca801f1..226f0b15e 100644
--- a/code_igniter/application/views/theme-bootstrap/v_summaries_read.php
+++ b/code_igniter/application/views/theme-bootstrap/v_summaries_read.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $item = $this->response->data[0];
diff --git a/code_igniter/application/views/theme-bootstrap/v_summaries_update_form.php b/code_igniter/application/views/theme-bootstrap/v_summaries_update_form.php
index 727243bf1..8baaecc60 100644
--- a/code_igniter/application/views/theme-bootstrap/v_summaries_update_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_summaries_update_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $edit = true;
diff --git a/code_igniter/application/views/theme-bootstrap/v_template.php b/code_igniter/application/views/theme-bootstrap/v_template.php
index 34f9bcf3c..bdb487e5c 100644
--- a/code_igniter/application/views/theme-bootstrap/v_template.php
+++ b/code_igniter/application/views/theme-bootstrap/v_template.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 include "v_lang.php";
diff --git a/code_igniter/application/views/theme-bootstrap/v_users_collection.php b/code_igniter/application/views/theme-bootstrap/v_users_collection.php
index 1a5705605..220585c86 100644
--- a/code_igniter/application/views/theme-bootstrap/v_users_collection.php
+++ b/code_igniter/application/views/theme-bootstrap/v_users_collection.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_users_create_form.php b/code_igniter/application/views/theme-bootstrap/v_users_create_form.php
index 07ab855f6..85e86de8a 100644
--- a/code_igniter/application/views/theme-bootstrap/v_users_create_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_users_create_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?>
diff --git a/code_igniter/application/views/theme-bootstrap/v_users_read.php b/code_igniter/application/views/theme-bootstrap/v_users_read.php
index 2392f58ca..f42ad139e 100644
--- a/code_igniter/application/views/theme-bootstrap/v_users_read.php
+++ b/code_igniter/application/views/theme-bootstrap/v_users_read.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $item = $this->response->data[0];
diff --git a/code_igniter/application/views/theme-bootstrap/v_users_update_form.php b/code_igniter/application/views/theme-bootstrap/v_users_update_form.php
index a91d2d2bc..11c9cc76b 100644
--- a/code_igniter/application/views/theme-bootstrap/v_users_update_form.php
+++ b/code_igniter/application/views/theme-bootstrap/v_users_update_form.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 $edit = true;
diff --git a/code_igniter/application/views/v_logon.php b/code_igniter/application/views/v_logon.php
index fd41121bc..47aa7a994 100644
--- a/code_igniter/application/views/v_logon.php
+++ b/code_igniter/application/views/v_logon.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 ?><!DOCTYPE html>
diff --git a/code_igniter/application/views/v_san_add.php b/code_igniter/application/views/v_san_add.php
index a0ea5187d..0c2e7cbcc 100644
--- a/code_igniter/application/views/v_san_add.php
+++ b/code_igniter/application/views/v_san_add.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/code_igniter/application/views/v_template.php b/code_igniter/application/views/v_template.php
index a312675e0..544991f33 100644
--- a/code_igniter/application/views/v_template.php
+++ b/code_igniter/application/views/v_template.php
@@ -30,7 +30,7 @@
 * @author    Mark Unwin <marku@opmantek.com>
 * @copyright 2014 Opmantek
 * @license   http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
-* @version   2.0.8
+* @version   2.0.10
 * @link      http://www.open-audit.org
  */
 
diff --git a/other/audit_aix.sh b/other/audit_aix.sh
index 1787a8430..71ae67905 100755
--- a/other/audit_aix.sh
+++ b/other/audit_aix.sh
@@ -36,7 +36,7 @@
 # @package Open-AudIT
 # @author Mark Unwin <marku@opmantek.com>
 # 
-# @version   2.0.8
+# @version   2.0.10
 
 # @copyright Copyright (c) 2014, Opmantek
 # @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
@@ -61,7 +61,7 @@ url="http://localhost/open-audit/index.php/input/devices"
 debugging=1
 
 # Version
-version="2.0.8"
+version="2.0.10"
 
 discovery_id=""
 help=""
diff --git a/other/audit_domain.vbs b/other/audit_domain.vbs
index 222be58f2..803e423fa 100644
--- a/other/audit_domain.vbs
+++ b/other/audit_domain.vbs
@@ -26,7 +26,7 @@
 ' @package Open-AudIT
 ' @author Mark Unwin <marku@opmantek.com>
 ' 
-' @version   2.0.8
+' @version   2.0.10
 
 ' @copyright Copyright (c) 2014, Opmantek
 ' @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
diff --git a/other/audit_esxi.sh b/other/audit_esxi.sh
index ebeb2ae96..7e5cd5ff8 100644
--- a/other/audit_esxi.sh
+++ b/other/audit_esxi.sh
@@ -28,7 +28,7 @@
 # @package Open-AudIT
 # @author Mark Unwin <marku@opmantek.com>
 # 
-# @version   2.0.8
+# @version   2.0.10
 
 # @copyright Copyright (c) 2014, Opmantek
 # @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
@@ -79,7 +79,7 @@ self_delete='n'
 debugging=2
 
 # Version
-version="2.0.8"
+version="2.0.10"
 
 discovery_id=""
 
diff --git a/other/audit_linux.sh b/other/audit_linux.sh
index df86f2299..ed5c1a9e3 100755
--- a/other/audit_linux.sh
+++ b/other/audit_linux.sh
@@ -28,7 +28,7 @@
 # @package Open-AudIT
 # @author Mark Unwin <marku@opmantek.com> and others
 # 
-# @version   2.0.8
+# @version   2.0.10
 
 # @copyright Copyright (c) 2014, Opmantek
 # @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
@@ -78,7 +78,7 @@ self_delete="n"
 debugging=2
 
 # Version
-version="2.0.8"
+version="2.0.10"
 
 # Display help
 help="n"
diff --git a/other/audit_list.vbs b/other/audit_list.vbs
index 6d8a831c1..def0026a3 100644
--- a/other/audit_list.vbs
+++ b/other/audit_list.vbs
@@ -26,7 +26,7 @@
 ' @package Open-AudIT
 ' @author Mark Unwin <marku@opmantek.com>
 ' 
-' @version   2.0.8
+' @version   2.0.10
 
 ' @copyright Copyright (c) 2014, Opmantek
 ' @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
diff --git a/other/audit_osx.sh b/other/audit_osx.sh
index 9cc192ea3..472272080 100755
--- a/other/audit_osx.sh
+++ b/other/audit_osx.sh
@@ -28,7 +28,7 @@
 # @package Open-AudIT
 # @author Mark Unwin <marku@opmantek.com>
 # 
-# @version   2.0.8
+# @version   2.0.10
 
 # @copyright Copyright (c) 2014, Opmantek
 # @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
@@ -49,7 +49,7 @@ system_id=""
 last_seen_by="audit"
 
 # Version
-version="2.0.8"
+version="2.0.10"
 
 # DO NOT REMOVE THE LINE BELOW
 # Configuration from web UI here
diff --git a/other/audit_solaris.sh b/other/audit_solaris.sh
index e23b7f432..8059228b5 100755
--- a/other/audit_solaris.sh
+++ b/other/audit_solaris.sh
@@ -28,7 +28,7 @@
 # @package Open-AudIT
 # @author Mark Unwin <marku@opmantek.com> and others
 # 
-# @version   2.0.8
+# @version   2.0.10
 # @copyright Copyright (c) 2014, Opmantek
 # @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
 
@@ -73,7 +73,7 @@ self_delete="n"
 debugging=2
 
 # Version
-version="2.0.8"
+version="2.0.10"
 
 # Display help
 help="n"
diff --git a/other/audit_subnet.sh b/other/audit_subnet.sh
index 1c967124e..1d2063ef6 100755
--- a/other/audit_subnet.sh
+++ b/other/audit_subnet.sh
@@ -28,7 +28,7 @@
 # @package Open-AudIT
 # @author Mark Unwin <marku@opmantek.com>
 # 
-# @version   2.0.8
+# @version   2.0.10
 
 # @copyright Copyright (c) 2014, Opmantek
 # @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
diff --git a/other/audit_subnet.vbs b/other/audit_subnet.vbs
index 21143e7db..ac56d77f4 100644
--- a/other/audit_subnet.vbs
+++ b/other/audit_subnet.vbs
@@ -26,7 +26,7 @@
 ' @package Open-AudIT
 ' @author Mark Unwin <marku@opmantek.com>
 ' 
-' @version   2.0.8
+' @version   2.0.10
 
 ' @copyright Copyright (c) 2014, Opmantek
 ' @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
diff --git a/other/audit_subnet_windows.vbs b/other/audit_subnet_windows.vbs
index ccf96cd8f..20e87ddb5 100644
--- a/other/audit_subnet_windows.vbs
+++ b/other/audit_subnet_windows.vbs
@@ -26,7 +26,7 @@
 ' @package Open-AudIT
 ' @author Mark Unwin <marku@opmantek.com>
 ' 
-' @version   2.0.8
+' @version   2.0.10
 
 ' @copyright Copyright (c) 2014, Opmantek
 ' @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
diff --git a/other/audit_windows.vbs b/other/audit_windows.vbs
index 4d5bb4cb3..b405cc400 100644
--- a/other/audit_windows.vbs
+++ b/other/audit_windows.vbs
@@ -26,7 +26,7 @@
 ' @package Open-AudIT
 ' @author Mark Unwin <marku@opmantek.com> and others
 ' 
-' @version   2.0.8
+' @version   2.0.10
 
 ' @copyright Copyright (c) 2014, Opmantek
 ' @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
@@ -103,7 +103,7 @@ self_delete = "n"
 debugging = "1"
 
 ' Version
-version = "2.0.8"
+version = "2.0.10"
 
 ' In normal use, DO NOT SET THIS.
 ' This value is passed in when running the audit_domain script.
@@ -4706,7 +4706,10 @@ if debugging > "1" then wscript.echo "Win 2000 Key" end if
 path = "SOFTWARE\Microsoft\Windows NT\CurrentVersion"
 subKey = "DigitalProductId"
 oReg.GetBinaryValue HKEY_LOCAL_MACHINE,path,subKey,key
-key_text = decodeKey(key)
+key_text = ""
+if not IsNull(key) then 
+	key_text = decodeKey(key)
+end if
 if (IsNull(key_text) or key_text = "") then
 	' do nothing
 else
diff --git a/other/discover_domain.vbs b/other/discover_domain.vbs
index ac8320d7a..aa5e8bd84 100644
--- a/other/discover_domain.vbs
+++ b/other/discover_domain.vbs
@@ -26,7 +26,7 @@
 ' @package Open-AudIT
 ' @author Mark Unwin <marku@opmantek.com>
 ' 
-' @version   2.0.8
+' @version   2.0.10
 
 ' @copyright Copyright (c) 2014, Opmantek
 ' @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
diff --git a/other/discover_subnet.sh b/other/discover_subnet.sh
index cefc219bc..210c19af2 100755
--- a/other/discover_subnet.sh
+++ b/other/discover_subnet.sh
@@ -28,7 +28,7 @@
 # @package Open-AudIT
 # @author Mark Unwin <marku@opmantek.com>
 # 
-# @version   2.0.8
+# @version   2.0.10
 
 # @copyright Copyright (c) 2014, Opmantek
 # @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
diff --git a/other/discover_subnet.vbs b/other/discover_subnet.vbs
index 628393f8c..18b66bdd1 100644
--- a/other/discover_subnet.vbs
+++ b/other/discover_subnet.vbs
@@ -26,7 +26,7 @@
 ' @package Open-AudIT
 ' @author Mark Unwin <marku@opmantek.com>
 ' 
-' @version   2.0.8
+' @version   2.0.10
 
 ' @copyright Copyright (c) 2014, Opmantek
 ' @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
diff --git a/other/discover_subnet_cron.sh b/other/discover_subnet_cron.sh
index b76bd0a05..02b8e1c89 100755
--- a/other/discover_subnet_cron.sh
+++ b/other/discover_subnet_cron.sh
@@ -28,7 +28,7 @@
 # @package Open-AudIT
 # @author Mark Unwin <marku@opmantek.com>
 # 
-# @version   2.0.8
+# @version   2.0.10
 
 # @copyright Copyright (c) 2014, Opmantek
 # @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
diff --git a/other/imports/devices.csv b/other/imports/devices.csv
new file mode 100644
index 000000000..e58a392c3
--- /dev/null
+++ b/other/imports/devices.csv
@@ -0,0 +1,2 @@
+"name","org_id","type","decscription","hostname","ip","netmask","manufacturer","model","serial","location_id","status","environment","asset_number","purchase_order_number","purchase_cost_center","purchase_vendor","purchase_date","warranty_duration","warranty_expires"
+"","1","computer","",,"","","","","","","1","production","production","","","","","2017-01-01","",""
\ No newline at end of file
diff --git a/other/imports/import_access_tokens.xls b/other/imports/import_access_tokens.xls
deleted file mode 100644
index 924898c32..000000000
Binary files a/other/imports/import_access_tokens.xls and /dev/null differ
diff --git a/other/imports/import_computers.xls b/other/imports/import_computers.xls
deleted file mode 100644
index e9dd4757d..000000000
Binary files a/other/imports/import_computers.xls and /dev/null differ
diff --git a/other/imports/import_locations.xls b/other/imports/import_locations.xls
deleted file mode 100644
index d52a6b108..000000000
Binary files a/other/imports/import_locations.xls and /dev/null differ
diff --git a/other/imports/import_networked_devices.xls b/other/imports/import_networked_devices.xls
deleted file mode 100644
index e5fdeb9e7..000000000
Binary files a/other/imports/import_networked_devices.xls and /dev/null differ
diff --git a/other/imports/import_phones.xls b/other/imports/import_phones.xls
deleted file mode 100644
index a927476dd..000000000
Binary files a/other/imports/import_phones.xls and /dev/null differ
diff --git a/other/imports/locations.csv b/other/imports/locations.csv
new file mode 100644
index 000000000..b8b729eb3
--- /dev/null
+++ b/other/imports/locations.csv
@@ -0,0 +1,2 @@
+"name","org_id","type","address","city","state","postcode","country"
+"","1","office","","","","",""
\ No newline at end of file
diff --git a/other/imports/orgs.csv b/other/imports/orgs.csv
new file mode 100644
index 000000000..d750f74c7
--- /dev/null
+++ b/other/imports/orgs.csv
@@ -0,0 +1,2 @@
+"name","parent_id","description"
+"","1",""
\ No newline at end of file
diff --git a/other/imports/phones.csv b/other/imports/phones.csv
new file mode 100644
index 000000000..82ca60ad3
--- /dev/null
+++ b/other/imports/phones.csv
@@ -0,0 +1,2 @@
+"name","org_id","type","decscription","manufacturer","model","serial","location_id","status","environment","asset_number","purchase_order_number","purchase_cost_center","purchase_vendor","purchase_date","warranty_duration","warranty_expires","service_number","service_provider","service_type","service_plan","service_network","unlock_pin","serial_imei","serial_sim"
+"","1","phone","","","","","1","production","production","","","","","2017-01-01","","","","","","","","",""
\ No newline at end of file
diff --git a/other/nmap_windows.vbs b/other/nmap_windows.vbs
index 49ed46647..e9810322d 100644
--- a/other/nmap_windows.vbs
+++ b/other/nmap_windows.vbs
@@ -26,7 +26,7 @@
 ' @package Open-AudIT
 ' @author Mark Unwin <marku@opmantek.com>
 ' 
-' @version   2.0.8
+' @version   2.0.10
 
 ' @copyright Copyright (c) 2014, Opmantek
 ' @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
diff --git a/other/openaudit_mysql.sql b/other/openaudit_mysql.sql
index 63634714b..2b27bedcb 100644
--- a/other/openaudit_mysql.sql
+++ b/other/openaudit_mysql.sql
@@ -483,11 +483,11 @@ INSERT INTO `configuration` VALUES (7,'discovery_linux_script_permissions','700'
 INSERT INTO `configuration` VALUES (8,'discovery_nmap_os','n','bool','y','system','2000-01-01 00:00:00','When discovery runs Nmap, should we use the -O flag to capture OS information (will slow down scan and requires SUID on the Nmap binary under Linux).');
 INSERT INTO `configuration` VALUES (9,'discovery_use_dns','y','bool','y','system','2000-01-01 00:00:00','Should we use DNS for looking up the hostname and domain.');
 INSERT INTO `configuration` VALUES (10,'discovery_use_ipmi','y','bool','y','system','2000-01-01 00:00:00','Should we use ipmitool for discovering management ports if ipmitool is installed.');
-INSERT INTO `configuration` VALUES (11,'display_version','2.0.8','text','n','system','2000-01-01 00:00:00','The version shown on the web pages.');
+INSERT INTO `configuration` VALUES (11,'display_version','2.0.10','text','n','system','2000-01-01 00:00:00','The version shown on the web pages.');
 INSERT INTO `configuration` VALUES (12,'download_reports','download','text','y','system','2000-01-01 00:00:00','Tells Open-AudIT to advise the browser to download as a file or display the csv, xml, json reports. Valid values are download and display.');
 INSERT INTO `configuration` VALUES (13,'graph_days','30','number','y','system','2000-01-01 00:00:00','The number of days to report on for the Enterprise graphs.');
 INSERT INTO `configuration` VALUES (14,'homepage','groups','text','y','system','2000-01-01 00:00:00','Any links to the default page should be directed to this endpoint.');
-INSERT INTO `configuration` VALUES (15,'internal_version','20170919','number','n','system','2000-01-01 00:00:00','The internal numerical version.');
+INSERT INTO `configuration` VALUES (15,'internal_version','20171010','number','n','system','2000-01-01 00:00:00','The internal numerical version.');
 INSERT INTO `configuration` VALUES (17,'log_level','5','number','y','system','2000-01-01 00:00:00','Tells Open-AudIT which severity of event (at least) should be logged.');
 INSERT INTO `configuration` VALUES (18,'log_retain_level_0','180','number','y','system','2000-01-01 00:00:00','Tells Open-AudIT how many days to keep logs with severity 0.');
 INSERT INTO `configuration` VALUES (19,'log_retain_level_1','180','number','y','system','2000-01-01 00:00:00','Tells Open-AudIT how many days to keep logs with severity 1.');
@@ -526,6 +526,9 @@ INSERT INTO `configuration` VALUES (52,'servers','','text','n','system','2000-01
 INSERT INTO `configuration` VALUES (53,'database_show_row_limit','1000','number','y','system','2000-01-01 00:00:00','The limit of rows to show, rather than download when exporting a database table.');
 INSERT INTO `configuration` VALUES (54,'collector_check_minutes','15','number','y','system','2000-01-01 00:00:00','The default check interval for collectors.');
 INSERT INTO `configuration` VALUES (55,'page_size','1000','number','y','system','2000-01-01 00:00:00','The default limit of rows to retrieve.');
+INSERT INTO `configuration` VALUES (56,'discovery_linux_use_sudo','y','bool','y','system','2000-01-01 00:00:00','When running discovery commands on a Linux target, should we use sudo.');
+INSERT INTO `configuration` VALUES (57,'delete_noncurrent_netstat','y','bool','y','system','2000-01-01 00:00:00','Should we store non-current netstat data and generate change logs.')
+INSERT INTO `configuration` VALUES (58,'delete_noncurrent_variable','y','bool','y','system','2000-01-01 00:00:00','Should we store non-current environment variable data and generate change logs.');
 /*!40000 ALTER TABLE `configuration` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -859,7 +862,7 @@ CREATE TABLE `fields` (
   `name` varchar(200) NOT NULL DEFAULT '',
   `org_id` int(10) unsigned NOT NULL DEFAULT '1',
   `group_id` int(10) unsigned NOT NULL DEFAULT '1',
-  `type` enum('varchar','list') NOT NULL DEFAULT 'varchar',
+  `type` enum('varchar','list','date') NOT NULL DEFAULT 'varchar',
   `values` text NOT NULL,
   `placement` enum('custom','system') NOT NULL DEFAULT 'system',
   `edited_by` varchar(200) NOT NULL DEFAULT '',
@@ -1166,7 +1169,7 @@ CREATE TABLE `ldap_servers` (
   `description` text NOT NULL,
   `lang` varchar(200) NOT NULL DEFAULT 'en',
   `host` varchar(200) NOT NULL DEFAULT '',
-  `port` varchar(200) NOT NULL DEFAULT '385',
+  `port` varchar(200) NOT NULL DEFAULT '389',
   `secure` enum('y','n') NOT NULL DEFAULT 'n',
   `domain` varchar(200) NOT NULL DEFAULT '',
   `type` enum('active directory','openldap') NOT NULL DEFAULT 'active directory',
diff --git a/other/test_windows_client.vbs b/other/test_windows_client.vbs
index 00cf02e6c..dc2e9f430 100644
--- a/other/test_windows_client.vbs
+++ b/other/test_windows_client.vbs
@@ -26,7 +26,7 @@
 ' @package Open-AudIT
 ' @author Mark Unwin <marku@opmantek.com>
 ' 
-' @version   2.0.8
+' @version   2.0.10
 
 ' @copyright Copyright (c) 2014, Opmantek
 ' @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
diff --git a/www/index.html b/www/index.html
index 8aa0ba42f..76e6c1230 100644
--- a/www/index.html
+++ b/www/index.html
@@ -33,7 +33,7 @@
  * @package Open-AudIT
  * @author Mark Unwin <marku@opmantek.com>
  * 
- * @version   2.0.8
+ * @version   2.0.10
 
  * @copyright Copyright (c) 2014, Opmantek
  * @license http://www.gnu.org/licenses/agpl-3.0.html aGPL v3
diff --git a/www/open-audit/css/open-audit.css b/www/open-audit/css/open-audit.css
index 41c7e8807..8cd13a86c 100644
--- a/www/open-audit/css/open-audit.css
+++ b/www/open-audit/css/open-audit.css
@@ -1,7 +1,7 @@
 /**
  * @author Mark Unwin <marku@opmantek.com>
  *
- * @version   2.0.8
+ * @version   2.0.10
 
  *
  * @copyright Copyright (c) 2014, Opmantek
diff --git a/www/open-audit/icons/details.svg b/www/open-audit/icons/details.svg
new file mode 100755
index 000000000..72e5fbc84
--- /dev/null
+++ b/www/open-audit/icons/details.svg
@@ -0,0 +1,387 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg1256"
+   sodipodi:version="0.32"
+   inkscape:version="0.43+devel"
+   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
+   sodipodi:docname="address-book-new.svg">
+  <defs
+     id="defs3">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5060">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop5062" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5064" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5048">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop5050" />
+      <stop
+         id="stop5056"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5052" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient12512">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop12513" />
+      <stop
+         style="stop-color:#fff520;stop-opacity:0.89108908;"
+         offset="0.50000000"
+         id="stop12517" />
+      <stop
+         style="stop-color:#fff300;stop-opacity:0.0000000;"
+         offset="1.0000000"
+         id="stop12514" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12512"
+       id="radialGradient278"
+       gradientUnits="userSpaceOnUse"
+       cx="55.000000"
+       cy="125.00000"
+       fx="55.000000"
+       fy="125.00000"
+       r="14.375000" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2116">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2118" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2120" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2094">
+      <stop
+         style="stop-color:#d6e3f0;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2096" />
+      <stop
+         style="stop-color:#95b1cf;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2098" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2803">
+      <stop
+         id="stop2805"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop2807"
+         offset="1.0000000"
+         style="stop-color:#cbcbcb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2795">
+      <stop
+         id="stop2797"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.068627454;" />
+      <stop
+         id="stop2799"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="4.9530048"
+       x2="41.219128"
+       y1="4.9530050"
+       x1="35.433035"
+       gradientTransform="matrix(0.254000,0.000000,1.822151e-16,3.759813,0.788629,0.148567)"
+       id="linearGradient2801"
+       xlink:href="#linearGradient2795"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="84.287079"
+       x2="10.219901"
+       y1="93.338043"
+       x1="10.496115"
+       gradientTransform="matrix(2.262742,0.000000,0.000000,0.441942,1.000000,-0.875000)"
+       id="linearGradient2813"
+       xlink:href="#linearGradient2803"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2094"
+       id="linearGradient2100"
+       gradientTransform="matrix(0.957750,0.000000,0.000000,1.027989,1.000000,-0.571911)"
+       x1="6.5871811"
+       y1="22.132999"
+       x2="14.511404"
+       y2="22.132999"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2116"
+       id="linearGradient2112"
+       gradientTransform="matrix(1.025428,0.000000,0.000000,0.957303,0.000000,-0.806758)"
+       x1="73.361984"
+       y1="26.652197"
+       x2="-2.7582901"
+       y2="21.270376"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient5013"
+       gradientUnits="userSpaceOnUse"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient5016"
+       gradientUnits="userSpaceOnUse"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient5020"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient5027"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient5029"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient5031"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="0.27843137"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="50.475782"
+     inkscape:cy="10.167608"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="872"
+     inkscape:window-height="659"
+     inkscape:window-x="679"
+     inkscape:window-y="221"
+     fill="#ef2929"
+     stroke="#cc0000"
+     inkscape:showpageshadow="false" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Addess Book - New</dc:title>
+        <dc:date />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://jimmac.musichall.cz</dc:source>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>address</rdf:li>
+            <rdf:li>contact</rdf:li>
+            <rdf:li>book</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Attribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="opacity:1;color:#000000;fill:#edd400;fill-opacity:1;fill-rule:evenodd;stroke:#c4a000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 33.096456,4.6520202 L 40.521077,4.6520202 C 41.228184,4.6520202 41.758513,4.8287969 41.93529,5.71268 L 42.819174,12.606972 C 42.907562,13.667632 42.443523,14.021185 41.493349,14.021185 L 32.919679,14.021185 L 33.096456,4.6520202 z "
+       id="path21630"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       sodipodi:nodetypes="ccccccc"
+       id="path21632"
+       d="M 34.10295,5.638875 L 40.463507,5.638875 C 40.771656,5.638875 40.940266,5.669037 40.986054,5.960473 L 41.777489,12.344449 C 41.847258,12.775421 41.959897,13.019804 41.637211,13.034341 L 33.963412,13.034341 L 34.10295,5.638875 z "
+       style="opacity:0.48538011;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000006;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    <path
+       sodipodi:nodetypes="ccccccc"
+       id="path21634"
+       d="M 35.596456,12.40202 L 43.021077,12.40202 C 43.728184,12.40202 44.258513,12.578797 44.43529,13.46268 L 45.319174,20.356972 C 45.407562,21.417632 44.943523,21.771185 43.993349,21.771185 L 35.419679,21.771185 L 35.596456,12.40202 z "
+       style="opacity:1;color:#000000;fill:#9db029;fill-opacity:1;fill-rule:evenodd;stroke:#727e0a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    <path
+       style="opacity:0.48538011;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000006;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 36.60295,13.388875 L 42.963507,13.388875 C 43.271656,13.388875 43.440266,13.419037 43.486054,13.710473 L 44.277489,20.094449 C 44.347258,20.525421 44.459897,20.769804 44.137211,20.784341 L 36.463412,20.784341 L 36.60295,13.388875 z "
+       id="path21636"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="opacity:1;color:#000000;fill:#ef2929;fill-opacity:1;fill-rule:evenodd;stroke:#cc0000;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 36.06451,20.776498 L 44.50992,20.776498 C 45.314245,20.776498 45.917487,20.995896 46.118569,22.092882 L 47.123975,30.649381 C 47.224515,31.965765 46.696677,32.40456 45.615866,32.40456 L 35.863428,32.40456 L 36.06451,20.776498 z "
+       id="path21638"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       sodipodi:nodetypes="ccccccc"
+       id="path21640"
+       d="M 37.209384,21.763574 L 44.444435,21.763574 C 44.79495,21.763574 44.986742,21.801928 45.038825,22.172513 L 45.939072,30.290267 C 46.018433,30.838284 46.146559,31.149038 45.779508,31.167522 L 37.050661,31.167522 L 37.209384,21.763574 z "
+       style="opacity:0.48538011;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000072;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    <g
+       id="g5022"
+       transform="matrix(2.165152e-2,0,0,4.307902e-2,43.08625,34.04509)">
+      <rect
+         y="-150.69685"
+         x="-1559.2523"
+         height="478.35718"
+         width="1339.6335"
+         id="rect4173"
+         style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path5058"
+         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
+         style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
+         id="path5018"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <path
+       style="color:#000000;fill:#5b6b94;fill-opacity:1;fill-rule:nonzero;stroke:#364878;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 6.3643222,5.5185897 C 6.4551049,3.6036003 7.3719758,2.5542814 9.0788784,2.549044 L 38.405776,2.4590577 C 38.652361,2.4583011 38.974317,2.6592071 38.999012,2.9089888 L 42.257491,35.867228 L 40.942189,35.923862 L 41.571429,42.369516 C 41.632441,42.994499 41.390059,43.52882 40.5,43.533035 L 9.7893046,43.678474 C 7.25676,43.690468 4.6538454,41.59976 4.7759337,39.024403 L 6.3643222,5.5185897 z "
+       id="rect1408"
+       sodipodi:nodetypes="csssccsssss" />
+    <path
+       id="path2489"
+       d="M 40.125,34.875 L 10.9375,35 C 9.3809819,35.177868 8.125,36.39612 8.125,38 C 8.125,39.60388 9.3809819,40.822132 10.9375,41 L 40.125,41.125 L 40.125,41.0625 C 38.469378,40.984348 37.125,39.674851 37.125,38 C 37.125,36.325149 38.469378,35.015652 40.125,34.9375 L 40.125,34.875 z "
+       style="color:#000000;fill:url(#linearGradient2813);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    <path
+       sodipodi:nodetypes="ccccccssc"
+       id="path2784"
+       d="M 9.6875,2.8125 C 7.9805897,2.8125 7.050103,3.8215062 6.96875,5.6738658 L 5.3125,37.825772 C 5.22054,40.904199 7.1393732,42.654485 9.125,43.15625 C 4.875,41.525579 5.4375,34.164455 10.75,34.195222 L 41.648286,34.195222 L 38.335786,3.2432432 C 38.310025,3.0025304 37.987878,2.8125 37.742036,2.8125 L 9.6875,2.8125 z "
+       style="color:#000000;fill:url(#linearGradient2100);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    <rect
+       y="3.968539"
+       x="9.7886267"
+       height="29.604792"
+       width="2"
+       id="rect2793"
+       style="opacity:0.48044691;color:#000000;fill:url(#linearGradient2801);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:0.60818715;visibility:visible;display:inline;overflow:visible"
+       transform="matrix(1.000000,0.000000,-3.582731e-2,0.999358,0.000000,0.000000)" />
+    <path
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2112);stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 9.8751008,3.3336831 C 8.1912014,3.3336831 7.5384236,4.0658459 7.4581673,5.887831 L 6.1592633,35.777198 C 7.0925916,34.170451 8.5988591,33.594437 11.011665,33.594437 L 40.963081,33.594437 L 38.137179,3.7573631 C 38.114727,3.5203092 37.793961,3.3336831 37.551434,3.3336831 L 9.8751008,3.3336831 z "
+       id="path2104"
+       sodipodi:nodetypes="cccscssc" />
+    <path
+       style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:120.00000477%;writing-mode:lr-tb;text-anchor:start;fill:#ad7fa8;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       d="M 21.12553,18.381288 C 21.050283,19.50227 21.269376,20.384155 21.782812,21.026947 C 22.296751,21.661909 23.039741,21.979388 24.011788,21.979387 C 24.97597,21.979388 25.754005,21.65799 26.345892,21.01519 C 26.945589,20.372398 27.282799,19.49443 27.357529,18.381288 C 27.431173,17.283839 27.207372,16.413709 26.686123,15.770905 C 26.165371,15.120279 25.426826,14.794959 24.470482,14.79495 C 23.521952,14.794959 22.743917,15.11636 22.136378,15.759145 C 21.536656,16.401952 21.199707,17.275998 21.12553,18.381288 M 27.29793,21.897075 C 26.787062,22.500679 26.216183,22.947501 25.58529,23.237544 C 24.962734,23.519747 24.247754,23.66085 23.44035,23.660849 C 22.092032,23.66085 21.027197,23.174832 20.245835,22.202797 C 19.472826,21.222925 19.138938,19.949092 19.244172,18.381288 C 19.349395,16.813498 19.858197,15.539665 20.770584,14.559781 C 21.682954,13.579917 22.809375,13.089981 24.149854,13.089969 C 24.957257,13.089981 25.656689,13.238924 26.24815,13.536791 C 26.840107,13.826846 27.347352,14.269749 27.76988,14.865501 L 27.873267,13.325141 L 29.554732,13.325141 L 28.973868,21.979387 C 30.129917,21.806931 31.058551,21.285637 31.759769,20.415508 C 32.469312,19.537544 32.870659,18.404812 32.963808,17.017304 C 33.020082,16.178542 32.947536,15.390722 32.746168,14.653848 C 32.552597,13.916994 32.226018,13.235002 31.766435,12.607873 C 31.020085,11.580979 30.077151,10.79708 28.937625,10.256176 C 27.806428,9.707462 26.551007,9.433097 25.171361,9.433081 C 24.207151,9.433097 23.27347,9.56244 22.370314,9.821111 C 21.467662,10.071974 20.623234,10.448244 19.837027,10.949925 C 18.552629,11.749517 17.517932,12.79994 16.732929,14.101199 C 15.956279,15.394643 15.517185,16.797819 15.415642,18.310738 C 15.331983,19.557142 15.476998,20.725151 15.85069,21.814765 C 16.232213,22.904387 16.822316,23.864664 17.621,24.695594 C 18.389368,25.51085 19.300238,26.130129 20.353615,26.553435 C 21.406448,26.984578 22.54823,27.20015 23.778962,27.200153 C 24.790178,27.20015 25.793384,27.027692 26.788584,26.682781 C 27.791068,26.345701 28.72125,25.859684 29.579139,25.224728 L 30.549801,26.529919 C 29.518874,27.2903 28.409917,27.870384 27.222932,28.270174 C 26.043227,28.677799 24.857618,28.881612 23.666104,28.881616 C 22.215881,28.881612 20.865341,28.622926 19.614483,28.105557 C 18.36308,27.596019 17.268571,26.851316 16.330955,25.871444 C 15.393328,24.89157 14.705054,23.758838 14.266133,22.47324 C 13.827731,21.179813 13.658252,19.792311 13.757696,18.310738 C 13.853452,16.88405 14.211263,15.523986 14.831129,14.230542 C 15.450993,12.937121 16.287663,11.800469 17.34115,10.820582 C 18.419191,9.825045 19.638236,9.0646655 20.998287,8.5394366 C 22.358842,8.0064001 23.779908,7.7398759 25.261489,7.7398585 C 26.923341,7.7398759 28.440813,8.080872 29.813913,8.7628469 C 31.194815,9.444854 32.325282,10.41297 33.205316,11.667193 C 33.741656,12.435425 34.132443,13.270279 34.377679,14.171752 C 34.630708,15.073243 34.724877,16.006082 34.660187,16.970271 C 34.521787,19.031929 33.789414,20.658519 32.463064,21.850041 C 31.136671,23.04157 29.374449,23.66085 27.17639,23.707883 L 27.29793,21.897075"
+       id="text21625" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:url(#radialGradient278);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.25000024;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block"
+       id="path12511"
+       sodipodi:cx="55"
+       sodipodi:cy="125"
+       sodipodi:rx="14.375"
+       sodipodi:ry="14.375"
+       d="M 69.375 125 A 14.375 14.375 0 1 1  40.625,125 A 14.375 14.375 0 1 1  69.375 125 z"
+       transform="matrix(0.611127,0.000000,0.000000,0.611127,-24.94992,-67.63529)"
+       inkscape:export-filename="/home/jimmac/ximian_art/icons/nautilus/suse93/stock_new-16.png"
+       inkscape:export-xdpi="33.852203"
+       inkscape:export-ydpi="33.852203" />
+  </g>
+</svg>
diff --git a/www/open-audit/index.php b/www/open-audit/index.php
index 69f66ff40..7d2b0915f 100644
--- a/www/open-audit/index.php
+++ b/www/open-audit/index.php
@@ -29,7 +29,7 @@
  * @author Mark Unwin <marku@opmantek.com>
  *
  * 
- * @version   2.0.8
+ * @version   2.0.10
 
  *
  * @copyright Copyright (c) 2014, Opmantek
diff --git a/www/open-audit/js/open-audit.js b/www/open-audit/js/open-audit.js
index 90b4a1b75..6f19ecad1 100644
--- a/www/open-audit/js/open-audit.js
+++ b/www/open-audit/js/open-audit.js
@@ -1,7 +1,7 @@
 /**
  * @author Mark Unwin <marku@opmantek.com>
  *
- * @version   2.0.8
+ * @version   2.0.10
 
  *
  * @copyright Copyright (c) 2014, Opmantek