diff --git a/sites/all/modules/voipdrupal/modules/voipscriptui/voipscriptui.module b/sites/all/modules/voipdrupal/modules/voipscriptui/voipscriptui.module
index 5169069..63735f7 100644
--- a/sites/all/modules/voipdrupal/modules/voipscriptui/voipscriptui.module
+++ b/sites/all/modules/voipdrupal/modules/voipscriptui/voipscriptui.module
@@ -12,9 +12,9 @@ function voipscriptui_voipscript_get_script_names() {
 
   //Create the Sql query. This uses various parts of Drupal 7's new DBTNG database abstraction layer.
   $result = db_select('node', 'n')
-  ->fields('n',array('title'))
-  ->condition('type','voipscriptui')
-  ->condition('status',1)
+  ->fields('n', array('title'))
+  ->condition('type', 'voipscriptui')
+  ->condition('status', 1)
   ->execute();
 
   foreach ($result as $node) {
@@ -122,7 +122,7 @@ function voipscriptui_menu() {
   $items['voip/voipscripts'] = array(
     'title' => 'VoIP Scripts',
     'page callback' => 'voipscriptui_scripts_page',
-    'access callback' => '_voipscriptui_check_view_access',
+    'access callback' => '_voipscriptui_check_view_node_access',
   );
 
   $items['voip/voipscripts/view/%'] = array(
@@ -131,15 +131,16 @@ function voipscriptui_menu() {
     'description' => 'View VoIP Script code',
     'page callback' => 'voipscriptui_scripts_view_page',
     'page arguments' => array(3),
-    'access callback' => '_voipscriptui_check_view_access',
+    'access callback' => '_voipscriptui_check_view_node_access',
   );
 
   return $items;
 }
 
-function _voipscriptui_check_view_access() {
-  $has_access = user_access('view all voipscripts') || user_access('view ui voipscripts');
-  return $has_access;
+function _voipscriptui_check_view_node_access() {
+ if(user_access('view all voipscripts') || user_access('view ui voipscripts')) {
+  return NODE_ACCESS_ALLOW;
+}
 }
 
 /**
@@ -150,8 +151,7 @@ function voipscriptui_form_alter(&$form, &$form_state, $form_id) {
     if (isset($_GET['clone_voipscript'])) {
       if (isset($_GET['type']) && $_GET['type'] == 'node') {
         $nid = $_GET['clone_voipscript'];
-        //TODO: change db name
-        $code = db_query("SELECT field_voipscriptui_code_value FROM {content_type_voipscriptui} WHERE nid = :nid", array(':nid' => $nid))->fetchField();
+        $code = db_query("SELECT field_voipscriptui_code_value FROM {field_data_field_voipscriptui_code} WHERE nid = :nid", array(':nid' => $nid))->fetchField();
       }
       else {
         $script_name = $_GET['clone_voipscript'];
@@ -425,4 +425,4 @@ function _voipscriptui_reverse_parser($script_name) {
     $cmd = $script->getNextCommand();
   }
   return $output;
-}
\ No newline at end of file
+}