diff --git a/Sccp_manager.class.php b/Sccp_manager.class.php
index 12254fb..6f63211 100644
--- a/Sccp_manager.class.php
+++ b/Sccp_manager.class.php
@@ -1165,7 +1165,7 @@ dbug('getting Phone Grid');
         $save_settings = array();
         $save_codec = array();
         $name_dev = '';
-        $db_field = $this->dbinterface->HWextension_db_SccpTableData("get_colums_sccpdevice");
+        $db_field = $this->dbinterface->HWextension_db_SccpTableData("get_columns_sccpdevice");
         $hw_id = (empty($get_settings['sccp_deviceid'])) ? 'new' : $get_settings['sccp_deviceid'];
         $hw_type = (empty($get_settings['sccp_device_typeid'])) ? 'sccpdevice' : $get_settings['sccp_device_typeid'];
         $update_hw = ($hw_id == 'new') ? 'update' : 'clear';
@@ -1407,7 +1407,7 @@ dbug('getting Phone Grid');
           );
          */
         $name_dev = '';
-        $db_field = $this->dbinterface->HWextension_db_SccpTableData("get_colums_sccpuser");
+        $db_field = $this->dbinterface->HWextension_db_SccpTableData("get_columns_sccpuser");
         // $hw_id = (empty($get_settings['sccp_deviceid'])) ? 'new' : $get_settings['sccp_deviceid'];
         // $update_hw = ($hw_id == 'new') ? 'update' : 'clear';
         $hw_prefix = 'SEP';
diff --git a/Sccp_manager.inc/dbinterface.class.php b/Sccp_manager.inc/dbinterface.class.php
index a4bd67e..0d3ee83 100644
--- a/Sccp_manager.inc/dbinterface.class.php
+++ b/Sccp_manager.inc/dbinterface.class.php
@@ -113,19 +113,19 @@ class dbinterface
             case 'HWextension':
                 $raw_settings = $this->getDb_model_info($get = "extension", $format_list = "model");
                 break;
-            case 'get_colums_sccpdevice':
-                $sql = "DESCRIBE sccpdevice";
+            case 'get_columns_sccpdevice':
+                $sql = 'DESCRIBE sccpdevice';
                 $stmt = $db->prepare($sql);
                 break;
-            case 'get_colums_sccpuser':
-                $sql = "DESCRIBE sccpuser";
+            case 'get_columns_sccpuser':
+                $sql = 'DESCRIBE sccpuser';
                 $stmts = $db->prepare($sql);
                 break;
             case 'get_sccpdevice_byid':
-                $sql = 'SELECT t1.*, types.dns,  types.buttons, types.loadimage, types.nametemplate as nametemplate, '
-                        . 'addon.buttons as addon_buttons FROM sccpdevice AS t1 '
-                        . 'LEFT JOIN sccpdevmodel as types ON t1.type=types.model '
-                        . 'LEFT JOIN sccpdevmodel as addon ON t1.addon=addon.model WHERE name="' . $data['id'] . '';
+                $sql = 'SELECT t1.*, types.dns,  types.buttons, types.loadimage, types.nametemplate as nametemplate,
+                        addon.buttons as addon_buttons FROM sccpdevice AS t1
+                        LEFT JOIN sccpdevmodel as types ON t1.type=types.model
+                        LEFT JOIN sccpdevmodel as addon ON t1.addon=addon.model WHERE name =\'' . $data['id'] . '\'';
                 $stmt = $db->prepare($sql);
                 break;
             case 'get_sccpuser':
@@ -246,6 +246,13 @@ class dbinterface
 
     function write($table_name = "", $save_value = array(), $mode = 'update', $key_fld = "", $hwid = "")
     {
+//dbug('entering write for table', $table_name);
+if ($table_name === 'sccpdevmodel'){
+dbug('entering write with save_value', $save_value);
+dbug('entering write with mode', $mode);
+dbug('entering write with key_fld', $key_fld);
+dbug('entering write with hwid', $hwid);
+}
         // mode clear  - Empty table before update
         // mode update - update / replace record
         global $db;
@@ -271,25 +278,22 @@ class dbinterface
                 if ($mode == 'clear') {
 //                    $sql = 'truncate `sccpsettings`';
                     $db->prepare('TRUNCATE sccpsettings')->execute();
-                    $stmt = $db->prepare('INSERT INTO sccpsettings (`keyword`, `data`, `seq`, `type`) VALUES (?,?,?,?)');
+                    $stmt = $db->prepare('INSERT INTO sccpsettings (keyword, data, seq, type) VALUES (?,?,?,?)');
                     $result = $db->executeMultiple($stmt, $save_value);
                 } else {
                     if (!empty($delete_value)) {
-                        $stmt = $db->prepare('DELETE FROM sccpsettings WHERE `keyword`=?');
+                        $stmt = $db->prepare('DELETE FROM sccpsettings WHERE keyword = ?');
                         $result = $db->executeMultiple($stmt, $delete_value);
                     }
                     if (!empty($save_value)) {
-                        $stmt = $db->prepare('REPLACE INTO sccpsettings (`keyword`, `data`, `seq`, `type`) VALUES (?,?,?,?)');
+                        $stmt = $db->prepare('REPLACE INTO sccpsettings (keyword, data, seq, type) VALUES (?,?,?,?)');
                         $result = $db->executeMultiple($stmt, $save_value);
                     }
                 }
                 break;
-            case 'sccpdevmodel':
-                break;
-            case 'sccpdevice':
-                break;
+            case 'sccpdevmodel':    // Fall through to next intentionally
+            case 'sccpdevice':    // Fall through to next intentionally
             case 'sccpuser':
-                $sql_db = $table_name;
                 $sql_key = "";
                 $sql_var = "";
                 foreach ($save_value as $key_v => $data) {
@@ -297,23 +301,24 @@ class dbinterface
                         $sql_var .= ', ';
                     }
                     if ($data === $this->val_null) {
-                        $sql_var .= '`' . $key_v . '`=NULL';
+                        $sql_var .= $key_v . '= NULL';
                     } else {
-                        $sql_var .= '`' . $key_v . '`="' . $data . '"';
+                        $sql_var .= $key_v . ' = \'' . $data . '\'';
                     }
                     if ($key_fld == $key_v) {
-                        $sql_key = '`' . $key_v . '`="' . $data . '"';
+                        $sql_key = $key_v . ' = \'' . $data . '\'';
                     }
                 }
                 if (!empty($sql_var)) {
-                    if ($mode == 'delete') {
-                        $req = 'DELETE FROM sccpuser WHERE ' . $sql_key . '';
-                    } else {
-                        if ($mode == 'update') {
-                            $req = 'UPDATE sccpuser SET ' . $sql_var .  'WHERE ' . $sql_key . '';
-                        } else {
-                            $req = 'REPLACE INTO sccpuser SET ' . $sql_var . '';
-                        }
+                    switch ($mode) {
+                        case 'delete':
+                            $req = 'DELETE FROM '. $table_name . ' WHERE ' . $sql_key;
+                            break;
+                        case 'update':
+                            $req = 'UPDATE ' . $table_name . ' SET ' . $sql_var . ' WHERE ' . $sql_key;
+                            break;
+                        default:
+                            $req = 'REPLACE INTO ' . $table_name . ' SET ' . $sql_var;
                     }
                 }
                 $result = $db->prepare($req)->execute();
@@ -327,14 +332,14 @@ class dbinterface
                         break;
                     case 'replace':
                         if (!empty($save_value)) {
-                            $sql = 'UPDATE sccpbuttonconfig SET `name`=? WHERE  `ref`= ? AND `reftype`=? AND `instance`=?  AND `buttontype`=?';
+                            $sql = 'UPDATE sccpbuttonconfig SET name =? WHERE  ref = ? AND reftype =? AND instance =?  AND buttontype =?';
                             $stmt = $db->prepare($sql);
                             $result= $db->executeMultiple($stmt, $save_value);
                         }
                         break;
                     default:
                         if (!empty($save_value)) {
-                            $sql = 'INSERT INTO sccpbuttonconfig (`ref`, `reftype`,`instance`, `buttontype`, `name`, `options`) VALUES (?,?,?,?,?,?)';
+                            $sql = 'INSERT INTO sccpbuttonconfig (ref, reftype, instance, buttontype, name, options) VALUES (?,?,?,?,?,?)';
                             $stmt = $db->prepare($sql);
                             $result = $db->executeMultiple($stmt, $save_value);
                         }