diff -urp subscriptions/subscriptions.admin.inc subscriptions.new/subscriptions.admin.inc
--- subscriptions/subscriptions.admin.inc	2008-02-24 23:27:42.000000000 -0500
+++ subscriptions.new/subscriptions.admin.inc	2008-02-24 23:30:52.000000000 -0500
@@ -250,8 +250,7 @@ function subscriptions_page_user_overvie
  * @params $account
  *   Must be a valid user account from user_load() or NULL (for the admin form).
  */
-function subscriptions_user_settings_form($account)
-{
+function subscriptions_user_settings_form($account) {
   $uid = (isset($account) ? $account->uid : -DRUPAL_AUTHENTICATED_RID);
   $tr = 't';
   $form['settings'] = array(
@@ -580,11 +579,10 @@ function subscriptions_form_helper(&$for
 }
 
 /**
- * Helper function for the submodules to hide invisible or empty
- * columns from their page form table(s).
+ * Helper function for the submodules to hide invisible or empty columns from
+ * their page form table(s).
  */
-function subscriptions_form_column_filter(&$form_table, $uid)
-{
+function subscriptions_form_column_filter(&$form_table, $uid) {
   foreach (array('send_interval', 'send_comments', 'send_updates', 'author') as $key) {
     if (isset($form_table[$key])) {
       $form_table[$key]['#access'] = ($uid <= 0 || $key == 'author' || _subscriptions_get_setting($key .'_visible', $uid) > 0);
diff -urp subscriptions/subscriptions.install subscriptions.new/subscriptions.install
--- subscriptions/subscriptions.install	2008-02-24 23:27:42.000000000 -0500
+++ subscriptions.new/subscriptions.install	2008-02-24 23:30:52.000000000 -0500
@@ -130,8 +130,7 @@ function subscriptions_install() {
 /**
  * User information message at installation and pre-2.0 upgrade time.
  */
-function _subscriptions_install_information()	
-{
+function _subscriptions_install_information()	{
   $t = get_t();
   drupal_set_message($t('Note: for standard Subscriptions functionality you need to enable the following modules:')
                      .'<ul><li>Subscriptions UI</li><li>Subscriptions Mail '.
diff -urp subscriptions/subscriptions.module subscriptions.new/subscriptions.module
--- subscriptions/subscriptions.module	2008-02-24 23:27:42.000000000 -0500
+++ subscriptions.new/subscriptions.module	2008-02-24 23:30:52.000000000 -0500
@@ -2,6 +2,23 @@
 // $Id: subscriptions.module,v 1.62.2.45.2.38 2008/02/21 22:27:39 chx Exp $
 
 /**
+ * @mainpage Subscriptions module
+ * 
+ * This module enables users to subscribe to be notified of changes to nodes or
+ * taxonomies, such as new comments in specific forums, or additions to some
+ * category of blog. Once enabled, all nodes will have an additional link that
+ * allows the user to change their subscriptions. Users have tab on their user
+ * screen to manage their own subscriptions. Users can also set an auto
+ * subscribe function which notifies the user if anyone comments on posts they
+ * have made. Admins can set this on by default.
+ */
+
+/**
+ * @file
+ * Subscriptions module.
+ */
+
+/**
  * Implementation of hook_menu().
  */
 function subscriptions_menu($may_cache) {
@@ -157,7 +174,7 @@ function subscriptions_write($access_key
 }
 
 /**
- * Queue events for notifications
+ * Queue events for notifications.
  *
  * @param $event
  *   Event array.
@@ -231,7 +248,7 @@ function subscriptions_queue($event) {
 }
 
 /**
- * Get subscription sid for the given parameters
+ * Get subscription sid for the given parameters.
  */
 function subscriptions_get_subscription($uid, $module, $field, $value, $author_uid = -1) {
   static $subscriptions;
@@ -245,7 +262,7 @@ function subscriptions_get_subscription(
 }
 
 /**
- * Get all subscription fields for the given parameters
+ * Get all subscription fields for the given parameters.
  */
 function subscriptions_get_full_subscription($uid, $module, $field, $value, $author_uid = -1) {
   $sql = "SELECT * FROM {subscriptions} WHERE module = '%s' AND field = '%s' AND value = '%s' AND author_uid = %d AND recipient_uid = %d";
@@ -253,7 +270,7 @@ function subscriptions_get_full_subscrip
 }
 
 /**
- * Create a subscription
+ * Create a subscription.
  */
 function subscriptions_write_subscription($module, $field, $value, $author_uid, $recipient_uid, $send_interval = 1, $send_updates = 0, $send_comments = 0) {
   db_query("UPDATE {subscriptions} SET send_interval = %d, send_updates = %d, send_comments = %d WHERE module = '%s' AND field ='%s' AND value='%s' AND recipient_uid = %d AND author_uid = %d", $send_interval, $send_updates, $send_comments, $module, $field, $value, $recipient_uid, $author_uid);
@@ -261,6 +278,7 @@ function subscriptions_write_subscriptio
     @db_query("INSERT INTO {subscriptions} (module, field, value, author_uid, recipient_uid, send_interval, send_updates, send_comments)  VALUES ('%s', '%s', '%s', %d, %d, %d, %d, %d)", $module, $field, $value, $author_uid, $recipient_uid, $send_interval, $send_updates, $send_comments);
   }
 }
+
 /**
  * Returns Delete form based on the given parameters.
  */
@@ -413,8 +431,7 @@ function _subscriptions_menu($account, $
 /**
  * Helper function for uasort()ing arrays with elements that have a 'weight'
  */
-function _subscriptions_cmp_by_weight($a, $b)
-{
+function _subscriptions_cmp_by_weight($a, $b) {
   $a = (isset($a['weight']) ? $a['weight'] : 0);
   $b = (isset($b['weight']) ? $b['weight'] : 0);
   return ($a < $b ? -1 : ($a == $b ? 0 : +1));
@@ -428,8 +445,7 @@ function _subscriptions_cmp_by_weight($a
  *   uses_defaults values;
  * $account can be NULL/0 (for site default), a user object, or a uid.
  */
-function _subscriptions_get_setting($name, $account)
-{
+function _subscriptions_get_setting($name, $account) {
   global $user;
   if (!isset($account) || is_numeric($account) && $account <= 0 ) {
     $uid = -DRUPAL_AUTHENTICATED_RID;
diff -urp subscriptions/subscriptions_ui.module subscriptions.new/subscriptions_ui.module
--- subscriptions/subscriptions_ui.module	2008-02-24 23:27:42.000000000 -0500
+++ subscriptions.new/subscriptions_ui.module	2008-02-24 23:30:52.000000000 -0500
@@ -6,7 +6,6 @@
  *
  * Inject the node subform into node pages (depending on the Display Settings).
  */
-
 function subscriptions_ui_nodeapi(&$node, $op, $teaser) {
   global $user;
   if ($user->uid && $op == 'view' && $node->nid && !$teaser &&
@@ -54,8 +53,7 @@ function subscriptions_ui_block($op = 'l
  *
  * Add a Subscribe link to node pages (depending on the Display Settings).
  */
-function subscriptions_ui_link($type, $node, $teaser)
-{
+function subscriptions_ui_link($type, $node, $teaser) {
   if ($type == 'node' && empty($teaser) && variable_get('subscriptions_form_link_only', 0) && arg(2) != 'subscribe' && 
       !_subscriptions_ui_node_is_blocked($node->nid)) {
     return array(array(