diff --git a/forward.module b/forward.module
index 703919b..b838cd0 100644
--- a/forward.module
+++ b/forward.module
@@ -21,6 +21,7 @@
 include(drupal_get_path('module', 'forward') .'/forward.theme');
 
 /**
+ * Implemtation of hook_perm().
  * Permissions
  */
 function forward_perm() {
@@ -28,6 +29,7 @@ function forward_perm() {
 }
 
 /**
+ * Implemtation of hook_menu().
  * Menu Hooks
  */
 function forward_menu() {
@@ -46,7 +48,7 @@ function forward_menu() {
     'access arguments' => array('administer forward'),
   );
   $items['admin/settings/forward'] = array(
-    'description'      => t('Configure settings for forward module.'),
+    'description'      => 'Configure settings for forward module.',
     'title'            => 'Forward',
     'page callback'    => 'drupal_get_form',
     'page arguments'   => array('forward_admin_settings'),
@@ -69,6 +71,7 @@ function forward_menu() {
 }
 
 /**
+ * Impementation of hook_access().
  * Access function
  */
 function forward_access($node) {
@@ -114,7 +117,7 @@ function forward_admin_settings() {
     '#type' => 'textfield',
     '#title' => t('Link title'),
     '#size' => 40,
-    '#default_value' => variable_get('forward_link_title', 'Email this !type'),
+    '#default_value' => variable_get('forward_link_title', t('Email this !type')),
     '#description' => t('Set the text of the link.  Use !type as a place holder for the node\'s content type or \'page\' depending on the setting above.'),
   );
   $form['forward_options']['forward_display_nodes'] = array(
@@ -154,8 +157,8 @@ function forward_admin_settings() {
   $form['forward_options']['forward_form_type'] = array(
     '#type' => 'select',
     '#title' => t('Form type'),
-    '#default_value' => variable_get('forward_form_type', 'link'),
-    '#options' => array('link' => 'link', 'form' => 'form'),
+    '#default_value' => variable_get('forward_form_type', t('link')),
+    '#options' => array('link' => t('link'), 'form' => t('form')),
     '#description' => t('Select link for a forward this page link or form to use a collapsible forwarding form.'),
   );
   $form['forward_options']['forward_flood_control'] = array(
@@ -224,17 +227,17 @@ function forward_admin_settings() {
     '#title' => t('Send a thank you email'),
     '#return_value' => 1,
     '#default_value' => variable_get('forward_thankyou_send', FALSE),
-    '#description' => t('If checked, Forward will send a thank you email to the user.'),
+    '#description' => t('Forward will send a thank you email to the user.'),
   );
   $form['forward_options']['forward_thankyou_subject'] = array(
     '#type' => 'textfield',
     '#title' => t('Thank you email subject'),
-    '#default_value' => variable_get('forward_thankyou_subject', 'Thank you for spreading the word about !site'),
+    '#default_value' => variable_get('forward_thankyou_subject', t('Thank you for spreading the word about !site')),
   );
   $form['forward_options']['forward_thankyou_text'] = array(
     '#type' => 'textarea',
     '#title' => t('Thank you email text'),
-    '#default_value' => variable_get('forward_thankyou_text', "Dear !name,\n\nThank you for your help in spreading the word about !site.  We appreciate your help."),
+    '#default_value' => variable_get('forward_thankyou_text', t("Dear !name,\n\nThank you for your help in spreading the word about !site. We appreciate your help.")),
     '#cols' => 40,
     '#rows' => 10,
     '#description' => t('This message will be emailed to the user if the Send a thank you email checkbox above is checked.  The token !site will be replaced with the site name and !name will be replaced with the user\'s name supplied on the forward form.'),
@@ -250,18 +253,18 @@ function forward_admin_settings() {
   $form['forward_text_values']['forward_instructions'] = array(
     '#type' => 'textarea',
     '#title' => t('Forward Instructions'),
-    '#default_value' => variable_get('forward_instructions', '<p>Thank you for your interest in spreading the word about !site.</p><p>NOTE: We only request your email address so that the person you are recommending the page to knows that you wanted them to see it, and that it is not junk mail. We do not capture any email address.</p>'),
+    '#default_value' => variable_get('forward_instructions', t('<p>Thank you for your interest in spreading the word about !site.</p><p>NOTE: We only request your email address so that the person you are recommending the page to knows that you wanted them to see it, and that it is not junk mail. We do not capture any email address.</p>')),
     '#cols' => 40,
     '#rows' => 10,
-    '#description' => t('This message will be displayed above the form.  The token !site will be replaced with the site name.'),
+    '#description' => t('This message will be displayed above the form. The token !site will be replaced with the site name.'),
   );
   $form['forward_text_values']['forward_thankyou'] = array(
     '#type' => 'textarea',
     '#title' => t('Thank You Message'),
-    '#default_value' => variable_get('forward_thankyou', 'Thank you for your help in spreading the word about !site.  We appreciate your help.'),
+    '#default_value' => variable_get('forward_thankyou', t('Thank you for your help in spreading the word about !site. We appreciate your help.')),
     '#cols' => 40,
     '#rows' => 10,
-    '#description' => t('This message will be displayed after the user successfully submits the form.  The token !site will be replaced with the site name.'),
+    '#description' => t('This message will be displayed after the user successfully submits the form. The token !site will be replaced with the site name.'),
   );
 
   // Forward Form Default Values
@@ -318,7 +321,7 @@ function forward_admin_settings() {
     '#title' => t('Include full node'),
     '#return_value' => 1,
     '#default_value' => variable_get('forward_full_body', FALSE),
-    '#description' => t('If checked, Forward will include the full body of the node rather than just the teaser'),
+    '#description' => t('Forward will include the full body of the node rather than just the teaser'),
   );
 
   // Forward Form Default Values
@@ -525,7 +528,7 @@ function forward_page() {
   
   if ($form_state['values']['path'] == 'epostcard') {
     $emailtype = 'postcard';
-    drupal_set_title(check_plain(t(variable_get('forward_epostcard_title', 'Send an e-Postcard'))));
+    drupal_set_title(check_plain(variable_get('forward_epostcard_title', t('Send an e-Postcard'))));
   }
   else {
     $emailtype = 'page';
@@ -533,7 +536,7 @@ function forward_page() {
       $cid = '?cid='. $_GET['cid'];
     }
     $form_state['values']['path'] .= $cid;
-    drupal_set_title(check_plain(t(variable_get('forward_email_title', 'Forward this page'))));
+    drupal_set_title(check_plain(variable_get('forward_email_title', t('Forward this page'))));
   }
   
   return drupal_get_form('forward_form', $form_state['values']['path'], $node->title);
@@ -559,7 +562,7 @@ function forward_form(&$form_state, $path = NULL, $title = NULL, $nodeapi = FALS
   if ($nodeapi == TRUE) {
     $form['message'] = array(
       '#type' => 'fieldset',
-      '#title' => check_plain(t(variable_get('forward_link_title', 'Email this !type'), array('!type' => 'page'))),
+      '#title' => check_plain(t(variable_get('forward_link_title', t('Email this !type')), array('!type' => 'page'))),
       '#description' => '',
       '#collapsed' => TRUE,
       '#collapsible' => TRUE,
@@ -567,7 +570,8 @@ function forward_form(&$form_state, $path = NULL, $title = NULL, $nodeapi = FALS
   }
   $form['message']['instructions'] = array(
     '#type' => 'item',
-    '#value' => filter_xss_admin(t(variable_get('forward_instructions', '<p>Thank you for your interest in spreading the word on !site.</p><p>NOTE: We only request your email address so that the person you are recommending the page to knows that you wanted them to see it, and that it is not junk mail. We do not capture any email address.</p>'), array('!site' => variable_get('site_name', 'drupal')))),
+    '#value' => filter_xss_admin(
+      t(variable_get('forward_instructions', t('<p>Thank you for your interest in spreading the word on !site.</p><p>NOTE: We only request your email address so that the person you are recommending the page to knows that you wanted them to see it, and that it is not junk mail. We do not capture any email address.</p>'), array('!site' => variable_get('site_name', 'drupal'))))),
   );
   $form['message']['email'] = array(
     '#type' => 'textfield',
@@ -602,14 +606,14 @@ function forward_form(&$form_state, $path = NULL, $title = NULL, $nodeapi = FALS
   $form['message']['subject'] = array(
     '#type' => 'item',
     '#title' => t('Message Subject'),
-    '#value' => t(variable_get('forward_'. $emailtype .'_subject', '!name has sent you a message from !site'), array('!name' => t('(Your Name)'), '!site' => variable_get('site_name', 'drupal'))),
+    '#value' => t(variable_get('forward_'. $emailtype .'_subject', t('!name has sent you a message from !site')), array('!name' => t('(Your Name)'), '!site' => variable_get('site_name', 'drupal'))),
     '#description' => '',
     '#attributes' => array('id' => 'forward-page-subject'),
   );
   $form['message']['body'] = array(
     '#type' => 'item',
     '#title' => t('Message Body'),
-    '#value' => t(variable_get('forward_'. $emailtype .'_message', '!name thought you would like to see the !site web site.'), array('!name' => t('(Your Name)'), '!site' => variable_get('site_name', 'drupal'))),
+    '#value' => t(variable_get('forward_'. $emailtype .'_message', t('!name thought you would like to see the !site web site.')), array('!name' => t('(Your Name)'), '!site' => variable_get('site_name', 'drupal'))),
     '#description' => '',
     '#attributes' => array('id' => 'forward-page-body'),
   );
@@ -707,13 +711,13 @@ function forward_form_validate($form, &$form_state) {
     }
   }
   if (strpos($form_state['values']['email'], "\r") !== FALSE || strpos($form_state['values']['email'], "\n") !== FALSE || $bad_string == TRUE) {
-    form_set_error('email', t('Header injection attempt detected.  Do not enter line feed characters into the from field!'));
+    form_set_error('email', t('Header injection attempt detected. Do not enter line feed characters into the from field!'));
   }
   if (user_validate_mail($form_state['values']['email'])) {
     form_set_error('email', t('Your Email address is invalid.'));
   }
   if (!$form_state['values']['name']) {
-    form_set_error('name', t('You must enter your name.'));
+    form_set_error('name', t('Enter your name.'));
   }
   if ($recipients == '') {
     form_set_error('recipients', t('You did not enter any recipients.'));
@@ -729,11 +733,11 @@ function forward_form_validate($form, &$form_state) {
     // Check if it looks like we are going to exceed the flood limit.
     // It is important to ensure that the number of e-mails to be sent count against the threshold.
     if (!flood_is_allowed('forward', variable_get('forward_flood_control', 10) - count($recipient_addresses) + 1)) {
-      form_set_error('recipients', check_plain(t(variable_get('forward_flood_error', "You can't send more than !number messages per hour. Please try again later."), array('!number' => variable_get('forward_flood_control', 10)))));
+      form_set_error('recipients', check_plain(t(variable_get('forward_flood_error', t("You can't send more than !number messages per hour. Please try again later.")), array('!number' => variable_get('forward_flood_control', 10)))));
     }
   }
   if ((variable_get('forward_message', 1) == 2) && (empty($form_state['values']['message']))) {
-    form_set_error('message', t('You must enter a message.'));
+    form_set_error('message', t('Enter a message.'));
   }
 }
 
@@ -832,7 +836,7 @@ function forward_form_submit($form, &$form_state) {
     'site_name' => check_plain(variable_get('site_name', 'Drupal')),
     'name' => check_plain($form_state['values']['name']),
     'email' => check_plain($form_state['values']['email']),
-    'forward_message' => t(variable_get('forward_'. $emailtype .'_message', '!name thought you would like to see the !site web site.'), array('!name' => l($form_state['values']['name'], 'mailto:'. $form_state['values']['email'], array('absolute' => TRUE)), '!site' => variable_get('site_name', 'drupal'))),
+    'forward_message' => t(variable_get('forward_'. $emailtype .'_message', t('!name thought you would like to see the !site web site.')), array('!name' => l($form_state['values']['name'], 'mailto:'. $form_state['values']['email'], array('absolute' => TRUE)), '!site' => variable_get('site_name', 'drupal'))),
     'message' => $message,
     'base_url' => $base_url,
     'content' => $content,
@@ -861,7 +865,7 @@ function forward_form_submit($form, &$form_state) {
     $params['body'] = theme('forward_'. $emailtype, $vars);
   }
 
-  $params['subject'] = t(variable_get('forward_'. $emailtype .'_subject', '!name has sent you a message from !site'), array('!name' => $form_state['values']['name'], '!site' => variable_get('site_name', 'drupal')));
+  $params['subject'] = t(variable_get('forward_'. $emailtype .'_subject', t('!name has sent you a message from !site')), array('!name' => $form_state['values']['name'], '!site' => variable_get('site_name', 'drupal')));
   
   $from = variable_get('forward_sender_address', '');
   if (empty($from)) {
@@ -891,13 +895,13 @@ function forward_form_submit($form, &$form_state) {
   variable_set('forward_total', variable_get('forward_total', 0) +1);
   variable_set('forward_recipients', variable_get('forward_recipients', 0) + count($recipients));
 
-  drupal_set_message(check_plain(t(variable_get('forward_thankyou', 'Thank you for your help in spreading the word about !site. We appreciate your help.'), array('!site' => variable_get('site_name', 'drupal')))), 'status');
+  drupal_set_message(check_plain(t(variable_get('forward_thankyou', t('Thank you for your help in spreading the word about !site. We appreciate your help.')), array('!site' => variable_get('site_name', 'drupal')))), 'status');
   
   if (variable_get('forward_thankyou_send', FALSE)) {
     $thankyou_params = array(
       'from' => variable_get('forward_sender_address', variable_get('site_mail', '')),
-      'subject' => t(variable_get('forward_thankyou_subject', 'Thank you for spreading the word about !site'), array('!site' => variable_get('site_name', 'drupal'))),
-      'body' => t(variable_get('forward_thankyou_text', "Dear !name,\n\nThank you for your help in spreading the word about !site.  We appreciate your help."), array('!site' => variable_get('site_name', 'drupal'), '!name' => check_plain($form_state['values']['name']))),
+      'subject' => t(variable_get('forward_thankyou_subject', t('Thank you for spreading the word about !site')), array('!site' => variable_get('site_name', 'drupal'))),
+      'body' => t(variable_get('forward_thankyou_text', t("Dear !name,\n\nThank you for your help in spreading the word about !site. We appreciate your help.")), array('!site' => variable_get('site_name', 'drupal'), '!name' => check_plain($form_state['values']['name']))),
     );
     drupal_mail('forward', 'forward_thankyou', trim($form_state['values']['email']), language_default(), $thankyou_params, $thankyou_params['from']);
   }
@@ -990,7 +994,7 @@ function forward_link($type, $node=0, $teaser=0) {
 
     if (!$teaser || variable_get('forward_display_teasers', 0)) {
       drupal_add_css(drupal_get_path('module', 'forward') .'/forward.css');
-      $title = check_plain(t(variable_get('forward_link_title', 'Email this !type'), array('!type' => $forward_link_type)));
+      $title = check_plain(t(variable_get('forward_link_title', t('Email this !type')), array('!type' => $forward_link_type)));
       $img = drupal_get_path('module', 'forward') .'/forward.gif';
       $html = FALSE;
       switch (variable_get('forward_link_style', 0)) {