diff --git includes/nodequeue.actions.inc includes/nodequeue.actions.inc
index fe5402b..471f0fe 100644
--- includes/nodequeue.actions.inc
+++ includes/nodequeue.actions.inc
@@ -2,7 +2,7 @@
 // $Id$
 
 /**
- * @file nodequeue.actions.inc
+ * @file
  * Provides actions integration for nodequeues.
  */
 
@@ -109,8 +109,8 @@ function action_nodequeue_add($op, $edit = array(), $node) {
       return array(
         'description' => t('Add to Nodequeues'),
         'type' => t('node'),
-        'batchable' => true,
-        'configurable' => true,
+        'batchable' => TRUE,
+        'configurable' => TRUE,
       );
       break;
 
@@ -237,8 +237,8 @@ function action_nodequeue_remove($op, $edit = array(), $node) {
       return array(
         'description' => t('Remove from Nodequeues'),
         'type' => t('node'),
-        'batchable' => true,
-        'configurable' => true,
+        'batchable' => TRUE,
+        'configurable' => TRUE,
       );
       break;
 
diff --git includes/views/nodequeue.views.inc includes/views/nodequeue.views.inc
index 494e749..d0314e0 100644
--- includes/views/nodequeue.views.inc
+++ includes/views/nodequeue.views.inc
@@ -2,7 +2,7 @@
 // $Id$
 
 /**
- * @file nodequeue.views.inc
+ * @file
  * Provides support for the Views module.
  *
  * This implementation is almost entirely based around a relationship
@@ -16,8 +16,6 @@
  * really quite simple.
  */
 
-
-
 function nodequeue_views_handlers() {
   return array(
   'info' => array(
@@ -26,7 +24,7 @@ function nodequeue_views_handlers() {
     'handlers' => array(
       'nodequeue_handler_argument_subqueue_qid' => array(
          'parent' => 'views_handler_filter_numeric',
-       ),
+      ),
       'nodequeue_handler_field_all_queues' => array(
         'parent' => 'views_handler_field_prerender_list',
       ),
@@ -68,7 +66,7 @@ function nodequeue_views_data() {
     'field' => array(
       'handler' => 'views_handler_field_numeric',
       'click sortable' => TRUE,
-     ),
+    ),
     'sort' => array(
       'handler' => 'views_handler_sort',
     ),
@@ -102,7 +100,7 @@ function nodequeue_views_data() {
     'field' => array(
       'handler' => 'views_handler_field_numeric',
       'click sortable' => TRUE,
-     ),
+    ),
     'sort' => array(
       'handler' => 'views_handler_sort',
     ),
@@ -120,7 +118,7 @@ function nodequeue_views_data() {
     'field' => array(
       'handler' => 'views_handler_field_numeric',
       'click sortable' => TRUE,
-     ),
+    ),
     'sort' => array(
       'handler' => 'views_handler_sort',
     ),
@@ -160,7 +158,7 @@ function nodequeue_views_data() {
     'field' => array(
       'handler' => 'views_handler_field',
       'click sortable' => TRUE,
-     ),
+    ),
     'sort' => array(
       'handler' => 'views_handler_sort',
     ),
@@ -190,7 +188,7 @@ function nodequeue_views_data() {
     'field' => array(
       'handler' => 'views_handler_field',
       'click sortable' => TRUE,
-     ),
+    ),
     'sort' => array(
       'handler' => 'views_handler_sort',
     ),
@@ -208,7 +206,7 @@ function nodequeue_views_data() {
     'field' => array(
       'handler' => 'views_handler_field',
       'click sortable' => TRUE,
-     ),
+    ),
     'sort' => array(
       'handler' => 'views_handler_sort',
     ),
diff --git includes/views/nodequeue_handler_argument_subqueue_qid.inc includes/views/nodequeue_handler_argument_subqueue_qid.inc
index bf9a0f5..445115d 100644
--- includes/views/nodequeue_handler_argument_subqueue_qid.inc
+++ includes/views/nodequeue_handler_argument_subqueue_qid.inc
@@ -1,4 +1,6 @@
 <?php
+// $Id$
+
 /**
  * Argument handler for subqueues.
  *
diff --git includes/views/nodequeue_handler_field_all_queues.inc includes/views/nodequeue_handler_field_all_queues.inc
index 794baf7..ccc7099 100644
--- includes/views/nodequeue_handler_field_all_queues.inc
+++ includes/views/nodequeue_handler_field_all_queues.inc
@@ -1,5 +1,6 @@
 <?php
-//$Id$
+// $Id$
+
 /**
  * Field handler for all queues.
  *
diff --git includes/views/nodequeue_handler_field_all_subqueues.inc includes/views/nodequeue_handler_field_all_subqueues.inc
index cc6a293..dcc0b95 100644
--- includes/views/nodequeue_handler_field_all_subqueues.inc
+++ includes/views/nodequeue_handler_field_all_subqueues.inc
@@ -1,5 +1,6 @@
 <?php
-//$Id$
+// $Id$
+
 /**
  * Field handler for all subqueues
  *
diff --git includes/views/nodequeue_handler_field_links.inc includes/views/nodequeue_handler_field_links.inc
index f236957..d34a28a 100644
--- includes/views/nodequeue_handler_field_links.inc
+++ includes/views/nodequeue_handler_field_links.inc
@@ -1,5 +1,6 @@
 <?php
-//$Id$
+// $Id$
+
 /**
  * Views field handler for the nodequeue queue links
  */
diff --git includes/views/nodequeue_handler_field_queue_tab.inc includes/views/nodequeue_handler_field_queue_tab.inc
index d7f6273..a89dad9 100644
--- includes/views/nodequeue_handler_field_queue_tab.inc
+++ includes/views/nodequeue_handler_field_queue_tab.inc
@@ -1,5 +1,6 @@
 <?php
-//$Id$
+// $Id$
+
 /**
  * Views field handler for the nodequeue queue links
  */
diff --git includes/views/nodequeue_handler_filter_in_queue.inc includes/views/nodequeue_handler_filter_in_queue.inc
index ee0b9db..4afacc8 100644
--- includes/views/nodequeue_handler_filter_in_queue.inc
+++ includes/views/nodequeue_handler_filter_in_queue.inc
@@ -1,5 +1,6 @@
 <?php
-//$Id$
+// $Id$
+
 /**
  * Handler to filter for nodes that are not in a queue.
  */
diff --git includes/views/nodequeue_handler_relationship_nodequeue.inc includes/views/nodequeue_handler_relationship_nodequeue.inc
index fbaf862..701f160 100644
--- includes/views/nodequeue_handler_relationship_nodequeue.inc
+++ includes/views/nodequeue_handler_relationship_nodequeue.inc
@@ -1,5 +1,6 @@
 <?php
-//$Id$
+// $Id$
+
 /**
  * Specialized relationship handler to add nodequeues.
  */
diff --git nodequeue.js nodequeue.js
index 6a49ed1..ae3aea2 100644
--- nodequeue.js
+++ nodequeue.js
@@ -347,7 +347,7 @@ Drupal.nodequeue = function(base, settings) {
               }
             },
             error: function(data) {
-              alert('An error occurred');
+              alert(Drupal.t('An error occurred'));
               $(input).parent().removeClass('throbbing');
               $(input).attr('disabled', false);
             }
diff --git nodequeue.module nodequeue.module
index 34c6b6c..14b5fd2 100644
--- nodequeue.module
+++ nodequeue.module
@@ -94,7 +94,7 @@ function nodequeue_menu() {
   foreach ($info as $key => $data) {
     $items['admin/structure/nodequeue/add/' . $key] = array(
       'title' => 'Add @type',
-      'title arguments' => array('@type' => strtolower($data['title'])),
+      'title arguments' => array('@type' => drupal_strtolower($data['title'])),
       'access arguments' => $admin_access,
       'page callback' => 'drupal_get_form',
       'page arguments' => array('nodequeue_edit_queue_form', $key),
@@ -171,7 +171,7 @@ function nodequeue_menu() {
   return $items;
 }
 /**
- * Implements hook_node_delete.
+ * Implements hook_node_delete().
  */
 function nodequeue_node_delete($node) {
   // If a node is being deleted, ensure it's also removed from any queues.
@@ -243,7 +243,7 @@ function nodequeue_link($type, $node = NULL, $teaser = FALSE) {
           'attributes' => array('class' => array($class . ' toggle-add')),
           'query' => $query_string);
       }
-      else if ($queue->link_remove) {
+      elseif ($queue->link_remove) {
         $links[$class] = array(
           'title' => nodequeue_title_substitute($queue->link_remove, $queue, $subqueue),
           'href' => "admin/structure/nodequeue/$queue->qid/remove-node/$subqueue->sqid/$id",
@@ -583,7 +583,7 @@ function nodequeue_view_queues() {
 
   // Fetch all of the queues.
   $queues = nodequeue_load_queues(nodequeue_get_all_qids(25));
-  
+
   foreach ($queues as $queue) {
     if (!nodequeue_queue_access($queue)) {
       unset($queues[$queue->qid]);
@@ -640,7 +640,7 @@ function nodequeue_view_queues() {
   }
 
   if (!empty($table_sort)) {
-    if (strtolower($table_sort['sort']) == 'desc') {
+    if (drupal_strtolower($table_sort['sort']) == 'desc') {
       array_multisort($sort_primary, $sort_direction['desc'], $sort_secondary, $queues); // Re-indexes array keys; key no longer equals qid.
     }
     else {
@@ -712,11 +712,11 @@ function nodequeue_edit_queue_form($form, &$form_state, $queue) {
   // For adding queues.
   if (is_string($queue)) {
     // If the $queue is a string - name of a queue type, basically - then we test that it's a valid queue type.
-    $queue = strtolower($queue);
+    $queue = drupal_strtolower($queue);
     if (!isset($info[$queue])) {
-      return false;
+      return FALSE;
     }
-    drupal_set_title(t('Add @type', array('@type' => strtolower($info[$queue]['title']))), PASS_THROUGH);
+    drupal_set_title(t('Add @type', array('@type' => drupal_strtolower($info[$queue]['title']))), PASS_THROUGH);
     $queue = new nodequeue_queue($queue);
   }
   else {
@@ -725,8 +725,8 @@ function nodequeue_edit_queue_form($form, &$form_state, $queue) {
 
   $form['description'] = array(
     '#type' => 'fieldset',
-    '#title' => $info[$queue->owner]['title'],
-    '#description' => $info[$queue->owner]['description'],
+    '#title' => check_plain($info[$queue->owner]['title']),
+    '#description' => check_plain($info[$queue->owner]['description']),
   );
 
   $form['title'] = array(
@@ -1004,7 +1004,7 @@ function nodequeue_admin_view($queue, $subqueue = array()) {
       return nodequeue_view_subqueues($queue);
     }
   }
-  else if ($subqueue->sqid) {
+  elseif ($subqueue->sqid) {
     if (!nodequeue_api_subqueue_access($subqueue, NULL, $queue)) {
       return drupal_not_found();
     }
@@ -1034,7 +1034,7 @@ function nodequeue_arrange_subqueue($queue, $subqueue = NULL) {
       return drupal_not_found();
     }
   }
-  else if ($subqueue->sqid) {
+  elseif ($subqueue->sqid) {
     if (!nodequeue_api_subqueue_access($subqueue, NULL, $queue)) {
       return drupal_not_found();
     }
@@ -1058,7 +1058,7 @@ function _nodequeue_dragdrop_get_nodes($queue, $subqueue) {
   // get a list of all nodes in the subqueue, regardless of access restrictions
   $query = db_select('node', 'n')
     ->distinct();
-    
+
   $query->leftJoin('users', 'u', 'n.uid = u.uid');
   $query->leftJoin('nodequeue_nodes', 'nq', 'nq.nid = n.nid');
   $query->fields('n', array('nid', 'title', 'created'))
@@ -1088,7 +1088,7 @@ function nodequeue_arrange_subqueue_form($form, $form_state, $queue, $nodes, $su
   $count = count($nodes);
   $form['nodes'] = array();
   $form['nodes']['#theme'] = 'nodequeue_arrange_subqueue_form_table';
-  
+
   // Theme function needs these
   $form['nodes']['#queue']    = (array) $queue;
   $form['nodes']['#subqueue'] = (array) $subqueue;
@@ -1280,7 +1280,7 @@ function nodequeue_save_subqueue_order($nodes, $qid, $sqid) {
       $clean[$count] = $nid;
       $count++;
     }
-    else if ($pos == 'r') {
+    elseif ($pos == 'r') {
       // call nodequeue_remove hook
       module_invoke_all('nodequeue_remove', $sqid, $nid);
     }
@@ -1717,7 +1717,7 @@ function nodequeue_load_queues($qids = array(), $bypass_cache = FALSE) {
 
   if (!empty($to_load)) {
     $result = db_query("SELECT q.*, COUNT(s.sqid) AS subqueues FROM {nodequeue_queue} q LEFT JOIN {nodequeue_subqueue} s ON q.qid = s.qid WHERE q.qid IN (:to_load) GROUP BY q.qid", array(':to_load' => $to_load));
-    
+
     foreach ($result as $queue) {
       $loaded[$queue->qid] = $queue;
       // ensure valid defaults:
@@ -1726,12 +1726,12 @@ function nodequeue_load_queues($qids = array(), $bypass_cache = FALSE) {
       $loaded[$queue->qid]->count = 0;
     }
 
-    $result = db_query("SELECT qid, rid FROM {nodequeue_roles} WHERE qid IN (:to_load)", array(':to_load' =>$to_load));
+    $result = db_query("SELECT qid, rid FROM {nodequeue_roles} WHERE qid IN (:to_load)", array(':to_load' => $to_load));
     foreach ($result as $obj) {
       $loaded[$obj->qid]->roles[] = $obj->rid;
     }
 
-    $result = db_query("SELECT qid, type FROM {nodequeue_types} WHERE qid IN (:to_load)", array(':to_load' =>$to_load));
+    $result = db_query("SELECT qid, type FROM {nodequeue_types} WHERE qid IN (:to_load)", array(':to_load' => $to_load));
     foreach ($result as $obj) {
       $loaded[$obj->qid]->types[] = $obj->type;
     }
@@ -1855,7 +1855,7 @@ function nodequeue_load_subqueues_by_queue($qids, $page_size = 0) {
     return array();
   }
 
-  $query = "SELECT s.*, COUNT(n.position) AS count FROM {nodequeue_subqueue} s 
+  $query = "SELECT s.*, COUNT(n.position) AS count FROM {nodequeue_subqueue} s
   LEFT JOIN {nodequeue_nodes} n ON n.sqid = s.sqid WHERE s.qid IN (:qids) GROUP BY s.sqid";
   $result = db_query($query, array(':qids' => $qids));
 
@@ -1891,7 +1891,7 @@ function nodequeue_load_subqueues_by_reference($references, $bypass_cache = FALS
       ->fields('s');
     $query->leftJoin('nodequeue_nodes', 'n', 'n.sqid = s.sqid');
     $query->addExpression('COUNT(n.position)', 'count');
-    
+
     $where = '';
     foreach ($references as $qid => $reference) {
       if ($where) {
@@ -1900,7 +1900,7 @@ function nodequeue_load_subqueues_by_reference($references, $bypass_cache = FALS
       $where .= 's.qid = :qid AND s.reference IN (:reference)';
       $query->where($where, array(':qid' => $qid, ':reference' => $reference));
     }
-    
+
     $result = $query->execute();
 
     foreach ($result as $subqueue) {
@@ -1929,12 +1929,12 @@ function nodequeue_save(&$queue) {
     'reverse' => $queue->reverse,
     'reference' => $queue->reference,
   );
-  
+
   if (!isset($queue->qid)) {
     $queue->qid = db_insert('nodequeue_queue')
       ->fields($nodequeue_queue_fields)
       ->execute();
-    
+
     if (function_exists('views_invalidate_cache')) {
       views_invalidate_cache();
     }
@@ -1948,7 +1948,7 @@ function nodequeue_save(&$queue) {
     db_delete('nodequeue_roles')
       ->condition('qid', $queue->qid)
       ->execute();
-      
+
     db_delete('nodequeue_types')
       ->condition('qid', $queue->qid)
       ->execute();
@@ -2005,7 +2005,7 @@ function nodequeue_delete($qid) {
   db_delete('nodequeue_roles')
     ->condition('qid', $qid)
     ->execute();
-    
+
   db_delete('nodequeue_types')
     ->condition('qid', $qid)
     ->execute();
@@ -2045,7 +2045,6 @@ function nodequeue_add_subqueue(&$queue, $title, $reference = NULL) {
   $subqueue->qid = $queue->qid;
   $subqueue->title = $title;
 
-  
   $subqueue->sqid = db_insert('nodequeue_subqueue')
     ->fields(array(
       'qid' => $queue->qid,
@@ -2172,7 +2171,7 @@ function nodequeue_subqueue_remove($sqid, $start, $end = NULL) {
   }
 
   // Retrieve the nodes that are being removed.
-  $result = db_query("SELECT nid FROM {nodequeue_nodes} WHERE sqid = :sqid AND position >= :start AND position <= :end", 
+  $result = db_query("SELECT nid FROM {nodequeue_nodes} WHERE sqid = :sqid AND position >= :start AND position <= :end",
     array(
       ':sqid' => $sqid,
       ':start' => $start,
@@ -2192,7 +2191,7 @@ function nodequeue_subqueue_remove($sqid, $start, $end = NULL) {
     ->condition('sqid', $sqid)
     ->condition('position', $end, '>')
     ->execute();
-    
+
   // Invoke the hook to let other modules know that the nodes were removed.
   foreach ($result as $node) {
     module_invoke_all('nodequeue_remove', $sqid, $node->nid);
@@ -2255,10 +2254,10 @@ function nodequeue_check_subqueue_sizes($queue) {
  */
 function nodequeue_queue_swap($subqueue, $pos1, $pos2) {
   // Grab the nid off one of the positions so we can more easily swap.
-  $nid = db_query("SELECT nid FROM {nodequeue_nodes} WHERE sqid = :sqid AND position = :position", 
+  $nid = db_query("SELECT nid FROM {nodequeue_nodes} WHERE sqid = :sqid AND position = :position",
     array(':sqid' => $subqueue->sqid, ':position' => $pos1))
     ->fetchField();
-    
+
   if (!$nid) {
     return;
   }
@@ -2312,7 +2311,7 @@ function nodequeue_queue_front($subqueue, $position) {
     ':position' => $position,
   ));
   $entry = $result->fetchObject();
-  
+
   db_delete('nodequeue_nodes')
     ->condition('sqid', $subqueue->sqid)
     ->condition('position', $position)
@@ -2323,7 +2322,7 @@ function nodequeue_queue_front($subqueue, $position) {
     ->condition('sqid', $subqueue->sqid)
     ->condition('position', $position, '<')
     ->execute();
-    
+
   db_insert('nodequeue_nodes')
     ->fields(array(
       'qid' => $entry->qid,
@@ -2332,7 +2331,7 @@ function nodequeue_queue_front($subqueue, $position) {
       'position' => 1,
       'timestamp' => $entry->timestamp,
     ))
-    ->execute(); 
+    ->execute();
 }
 
 /**
@@ -2342,13 +2341,13 @@ function nodequeue_queue_back($subqueue, $position) {
   if ($position < 1 || $position >= $subqueue->count) {
     return;
   }
-  
+
   $result = db_query("SELECT * FROM {nodequeue_nodes} WHERE sqid= :sqid AND position = :position", array(
     ':sqid' => $subqueue->sqid,
     ':position' => $position,
   ));
   $entry = $result->fetchObject();
-  
+
   db_delete('nodequeue_nodes')
     ->condition('sqid', $subqueue->sqid)
     ->condition('position', $position)
@@ -2359,7 +2358,7 @@ function nodequeue_queue_back($subqueue, $position) {
     ->condition('sqid', $subqueue->sqid)
     ->condition('position', $position, '<')
     ->execute();
-    
+
   db_insert('nodequeue_nodes')
     ->fields(array(
       'qid' => $entry->qid,
@@ -2368,7 +2367,7 @@ function nodequeue_queue_back($subqueue, $position) {
       'position' => $subqueue->count,
       'timestamp' => $entry->timestamp,
     ))
-    ->execute(); 
+    ->execute();
 }
 
 /**
@@ -2388,7 +2387,7 @@ function nodequeue_set_subqueue_positions(&$subqueues, $nid) {
   if (empty($subqueues)) {
     return;
   }
-  
+
   $query = db_select('nodequeue_nodes', 'n')
     ->fields('n', array('sqid'))
     ->condition('sqid', array_keys($subqueues), 'IN')
@@ -2438,7 +2437,7 @@ function nodequeue_subqueue_size_text($max, $count, $long = TRUE) {
   if (empty($count)) {
     $message = theme('nodequeue_subqueue_empty_text');
   }
-  else if ($count == $max) {
+  elseif ($count == $max) {
     $message = theme('nodequeue_subqueue_full_text');
   }
   else {
@@ -2531,7 +2530,7 @@ function nodequeue_nodequeue_form_submit(&$queue, $form_state) {
 /**
  * in general it's preferable to use Views for this functionality.
  */
-function nodequeue_node_titles($sqid, $title = '', $backward = true, $from = 0, $count = 0, $published_only = TRUE) {
+function nodequeue_node_titles($sqid, $title = '', $backward = TRUE, $from = 0, $count = 0, $published_only = TRUE) {
   $orderby = ($backward ? "DESC" : "ASC");
   $query = db_select('node', 'n')
     ->fields('n', array('nid', 'title'))
@@ -2539,7 +2538,7 @@ function nodequeue_node_titles($sqid, $title = '', $backward = true, $from = 0,
     ->orderBy('nn.position', $orderby)
     ->addTag('node_access');
   $query->leftJoin('nodequeue_nodes', 'nn', 'n.nid = nn.nid');
-  
+
   if ($published_only) {
     $query->condition('n.status', 1);
   }
@@ -2575,7 +2574,7 @@ function nodequeue_load_nodes($sqid, $backward = FALSE, $from = 0, $count = 5, $
     ->orderBy('nn.position', $orderby)
     ->addTag('node_access');
   $query->join('nodequeue_nodes', 'nn', 'n.nid = nn.nid');
-  
+
   if ($published_only) {
     $query->condition('n.status', 1);
   }
@@ -2622,7 +2621,7 @@ function nodequeue_view_random_node($sqid, $teaser = TRUE, $links = TRUE) {
     ->execute()
     ->fetchField();
   $query->join('nodequeue_nodes', 'nn', 'n.nid = nn.nid');
-  
+
   return nodequeue_view_nodes($sqid, FALSE, $teaser, $links, rand(0, $count - 1), 1);
 }
 
@@ -2639,7 +2638,7 @@ function nodequeue_load_random_node($sqid) {
     ->execute()
     ->fetchField();
   $query->join('nodequeue_nodes', 'nn', 'n.nid = nn.nid');
-  
+
   return array_shift(nodequeue_load_nodes($sqid, TRUE, rand(0, $count - 1), 1));
 }
 
@@ -2661,7 +2660,7 @@ function nodequeue_queue_position($qid, $nid) {
     ->range(0, 1)
     ->execute()
     ->fetchField();
-  
+
   return nodequeue_subqueue_position($sqid, $nid);
 }
 
@@ -2811,7 +2810,7 @@ function nodequeue_api_autocomplete($queue, $subqueue, $string) {
   }
   else {
     $result = $query->execute();
-      
+
     foreach ($result as $node) {
       $matches[$node->nid] = check_plain($node->title) . " [nid: $node->nid]";
     }
@@ -2985,9 +2984,9 @@ function theme_nodequeue_arrange_subqueue_form_table($variables) {
       'nodequeue' => array(
         'reverse' => (bool) $form['#queue']['reverse'],
       )
-    ), 
+    ),
     array(
-      'type' => 'setting', 
+      'type' => 'setting',
       'scope' => JS_DEFAULT,
     )
   );