diff --git a/nodequeue.install b/nodequeue.install
index 7bb9fe2..e60a207 100644
--- a/nodequeue.install
+++ b/nodequeue.install
@@ -3,9 +3,11 @@
 /**
  * @file
  * Install, update and uninstall functions for the nodequeue module.
- *
  */
 
+/**
+ * Implements hook_schema().
+ */
 function nodequeue_schema() {
   $schema['nodequeue_queue'] = array(
     'description' => 'Base table for queues, storing global information for each queue',
@@ -23,7 +25,7 @@ function nodequeue_schema() {
         'not null' => TRUE,
       ),
       'subqueue_title' => array(
-        'description' => '',
+        'description' => 'Title of a subqueue.',
         'type' => 'varchar',
         'length' => 255,
         'not null' => TRUE,
@@ -219,177 +221,10 @@ function nodequeue_schema() {
   return $schema;
 }
 
-// TODO: Figure out what to fix here?
-/**
- * @todo Please insert a Doxygen style comment for this hook_update_N.
- *
- */
-function nodequeue_update_1() {
-  if ($GLOBALS['db_type'] == 'pgsql') {
-    db_query("CREATE SEQUENCE nodequeue_queue_qid_seq INCREMENT 1 START 1");
-  }
-}
-
-/**
- * @todo Please insert a Doxygen style comment for this hook_update_N.
- *
- */
-function nodequeue_update_5000() {
-  $ret = array();
-  $ret[] = array('success' => TRUE, 'query' => t('Some of the following queries may appear to fail. This is not a problem.'));
-
-  db_add_field("nodequeue_queue", "link", array(
-        'description' => t('The link text to show under a node to add it to the queue.'),
-        'type' => 'varchar',
-        'length' => 40,
-      ));
-  db_add_field("nodequeue_queue", "link_remove", array(
-        'description' => t('The link text to show under a node to remove it from the queue.'),
-        'type' => 'varchar',
-        'length' => 40,
-      ));
-
-  db_add_index('nodequeue_roles', "{nodequeue_roles}_qid", array('qid'));
-  db_add_index("nodequeue_roles", "{nodequeue_roles}_rid", array('rid'));
-  db_add_index("nodequeue_types", "{nodequeue_types}_qid", array('qid'));
-  db_add_index("nodequeue_nodes", "{nodequeue_nodes}_qid", array('qid', 'position'));
-  db_add_index("nodequeue_nodes", "{nodequeue_nodes}_nid", array('nid'));
-
-  return $ret;
-}
-
-/**
- * @todo Please insert a Doxygen style comment for this hook_update_N.
- *
- */
-function nodequeue_update_5001() {
-  $ret = array();
-  db_add_column($ret, 'nodequeue_nodes', 'timestamp', array('type' => 'int', 'default' => 0, 'not null' => TRUE));
-  return $ret;
-}
-
 /**
- * @todo Please insert a Doxygen style comment for this hook_update_N.
- *
- */
-function nodequeue_update_5201() {
-  $ret = array();
-  // Add new columns to the nodequeue_queue table.
-  db_add_column($ret, 'nodequeue_queue', 'owner', array('type' => 'varchar', 'length' => 255, 'default' => "'nodequeue'"));
-  db_add_column($ret, 'nodequeue_queue', 'show_in_ui', array('type' => 'int', 'default' => 1));
-  db_add_column($ret, 'nodequeue_queue', 'show_in_tab', array('type' => 'int', 'default' => 1));
-  db_add_column($ret, 'nodequeue_queue', 'show_in_links', array('type' => 'int', 'default' => 1));
-  db_add_column($ret, 'nodequeue_queue', 'reference', array('type' => 'varchar', 'length' => 255, 'default' => 0));
-
-  // Create the nodequeue_subqueue table.
-  $ret[] = update_sql("UPDATE {nodequeue_queue} SET owner = 'nodequeue', show_in_ui = 1, show_in_tab = 1, show_in_links = 1, reference = 0");
-
-  db_create_table('nodequeue_subqueue', array(
-    'description' => t('Subqueues are minor queues that inherit all of the properties of the parent queue. A parent queue must have at least 1 subqueue to do anything. Reference is for the use of whatever is creating the subqueues in order to link it to some other ID easily.'),
-    'fields' => array(
-      'sqid' => array(
-        'description' => t('Subqueue identifier'),
-        'type' => 'serial',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-      ),
-      'qid' => array(
-        'description' => t('Queue identifier.'),
-        'type' => 'int',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-      ),
-      'reference' => array(
-        'description' => '',
-        'type' => 'varchar',
-        'length' => 255,
-        'default' => '0',
-      ),
-      'title' => array(
-        'description' => '',
-        'type' => 'varchar',
-        'length' => 255,
-        'default' => '',
-      ),
-    ), // fields
-    'primary key' => array('sqid'),
-    'indexes' => array(
-      '{nodequeue_subqueue}_qid_idx' => array('qid'),
-      '{nodequeue_subqueue}_reference_idx' => array('reference'),
-      '{nodequeue_subqueue}_title_idx' => array('title'),
-    ), // indexes
-  ));
-
-  // Populate the nodequeue_subqueue table.
-  $result = db_query("SELECT * FROM {nodequeue_queue}");
-  while ($queue = db_fetch_object($result)) {
-    // Keep the qid so that we can update our sequence table later on.
-    $last_qid = $queue->qid;
-    $ret[] = update_sql("INSERT INTO {nodequeue_subqueue} (sqid, qid, reference, title) VALUES (%d, %d, %d, '%s')", $queue->qid, $queue->qid, $queue->qid, $queue->title);
-  }
-
-  // Transform the nodequeue_nodes table.
-  db_add_field('nodequeue_nodes', 'sqid', array('type' => 'int'));
-  $ret[] = update_sql("UPDATE {nodequeue_nodes} SET sqid = qid");
-  db_add_index('nodequeue_nodes', '{nodequeue_nodes}_sqid', array('sqid', 'position'));
-
-  return $ret;
-}
-
-/**
- * @todo Please insert a Doxygen style comment for this hook_update_N.
- *
- */
-function nodequeue_update_5202() {
-  $ret = array();
-  db_add_field('nodequeue_queue', 'subqueue_title', array('type' => 'varchar', 'length' => 255));
-  return $ret;
-}
-
-/**
- * @todo Please insert a Doxygen style comment for this hook_update_N.
- *
- */
-function nodequeue_update_5203() {
-  $ret = array();
-  db_add_field('nodequeue_queue', 'reverse', array(type => 'int'));
-  return $ret;
-}
-
-/**
- * @todo Please insert a Doxygen style comment for this hook_update_N.
- *
- */
-function nodequeue_update_5204() {
-  $ret = array();
-  db_change_field('nodequeue_queue', 'reverse', 'reverse', array('type' => 'int', 'size' => 'tiny'));
-  return $ret;
-}
-
-/**
- * @todo Please insert a Doxygen style comment for this hook_update_N.
- *
- */
-function nodequeue_update_5205() {
-  $ret = array();
-  db_drop_primary_key('nodequeue_queue');
-  db_change_field('nodequeue_queue', 'qid', 'qid',
-  array('type' => 'serial', 'not null' => TRUE),
-  array('primary key' => array('qid')));
-
-  db_drop_primary_key('nodequeue_subqueue');
-  db_change_field('nodequeue_subqueue', 'sqid', 'sqid',
-  array('type' => 'serial', 'not null' => TRUE),
-  array('primary key' => array('sqid')));
-  //When these quries don't fail, the function fails to return the empty array, causing an array merge error in update.php on line 174.
-  if (empty($ret)) {
-    return array();
-  }
-  return $ret;
-}
-/**
- * There was a discrepancy between the link/link_remove fields created with node_install/node_schema, and the ones created with nodequeue_update_5000.  This forces everyone to 40 characters.
- *
+ * There was a discrepancy between the link/link_remove fields created with
+ * node_install/node_schema, and the ones created with nodequeue_update_5000.
+ * This forces everyone to 40 characters.
  */
 function nodequeue_update_6000() {
   $ret = array();
@@ -410,8 +245,9 @@ function nodequeue_update_6001() {
 
 //The previous 6002 update has been moved to 5205.
 
-/*
- * Remove invalid entries from the nodequeue_nodes table created as a result of bugs like http://drupal.org/node/593858.
+/**
+ * Remove invalid entries from the nodequeue_nodes table created as a result of
+ * bugs like http://drupal.org/node/593858.
  */
 function nodequeue_update_6003() {
   $ret = array();
@@ -436,7 +272,7 @@ function nodequeue_update_6004() {
   return $ret;
 }
 
-/*
+/**
  * Rename the 'nodequeue_automatic_views_generation'
  * to 'nodequeue_view_per_queue'.
  */
@@ -445,6 +281,7 @@ function nodequeue_update_6005() {
   $ret[] = update_sql("UPDATE {system} set name = 'nodequeue_view_per_queue' where name = 'nodequeue_automatic_views_generation'");
   return $ret;
 }
+
 /**
  * Implements hook_requirements().
  *
diff --git a/smartqueue.install b/smartqueue.install
index f11eeaa..3d87fe7 100644
--- a/smartqueue.install
+++ b/smartqueue.install
@@ -2,16 +2,18 @@
 
 /**
  * @file
- * Install, update and uninstall functions for the nodequeue module.
- *
+ * Install, update and uninstall functions for the smartqueue module.
  */
 
+/**
+ * Implements hook_schema().
+ */
 function smartqueue_schema() {
   $schema['smartqueue'] = array(
     'description' => 'Table for smartqueues, storing global information for each queue.',
     'fields' => array(
       'qid' => array(
-        'description' => t('The primary identifier for a queue.'),
+        'description' => 'The primary identifier for a queue.',
         'type' => 'serial',
         'unsigned' => TRUE,
         'not null' => TRUE