diff --git email_example/email_example.info email_example/email_example.info
index d8f9294..e07c400 100644
--- email_example/email_example.info
+++ email_example/email_example.info
@@ -1,5 +1,5 @@
 ; $Id$
 name = E-mail Example
-description = Demonstrate Drupal's e-mail functionality.
+description = Demonstrate Drupal's e-mail APIs.
 package = Example modules
 core = 6.x
\ No newline at end of file
diff --git email_example/email_example.module email_example/email_example.module
index 2670b44..f534b08 100644
--- email_example/email_example.module
+++ email_example/email_example.module
@@ -5,12 +5,12 @@
  * @file
  * Example of how to use Drupal's mail API.
  *
- * This example module provides two different examples of the Drupal email
- * sytem:
+ * This example module provides two different examples of the Drupal email API.
  *  - defines a simple contact form and shows how to use drupal_mail()
  *    to send an e-mail (defined in hook_mail()) when the form is submitted.
- *  - how to alter emails defined by other Drupal modules or Core, attaching a
- *    custom signature before they are sent.
+ *  - shows how modules can alter emails defined by other Drupal modules or
+ *    Core using hook_mail_alter by attaching a custom signature before
+ *    they are sent.
  */
 
 /**
@@ -27,6 +27,10 @@
  * The $params argument is an array which can hold any additional data required
  * to build the mail subject and body; for example, user-entered form data, or
  * some context information as to where the mail request came from.
+ *
+ * Note that hook_mail() is not actually a hook. It is only called for a single
+ * module, the module named in the first argument of drupal_mail(). So it's
+ * a callback of a type, but not a hook.
  */
 function email_example_mail($key, &$message, $params) {
   global $user;
@@ -54,6 +58,8 @@ function email_example_mail($key, &$message, $params) {
  *
  * @param $form_values
  *   An array of values from the contact form fields that were submitted.
+ *   There are just two relevant items: $form_values['email'] and
+ *   $form_values['message'].
  */
 function email_example_mail_send($form_values) {
   // All system mails need to specify the module and template key (mirrored from
@@ -65,9 +71,9 @@ function email_example_mail_send($form_values) {
   $to = $form_values['email'];
   $from = variable_get('site_mail', 'admin@example.com');
 
-  // "params" can load in additional context to the e-mail template. In this
-  // case, we want to pass in the values the user entered into the form, which
-  // includes the message body.
+  // "params" loads in additional context for email content completion in
+  // hook_mail(). In this case, we want to pass in the values the user entered
+  // into the form, which include the message body in $form_values['message'].
   $params = $form_values;
 
   // The language of the e-mail. This will one of three values:
@@ -89,15 +95,15 @@ function email_example_mail_send($form_values) {
   // called. This defaults to TRUE, and is normally what you want unless you
   // need to do additional processing before drupal_mail_send() is called.
   $send = TRUE;
-
   // Send the mail, and check for success. Note that this does not guarantee
   // message delivery; only that there were no PHP-related issues encountered
   // while sending.
-  if (drupal_mail($module, $key, $to, $language, $params, $from, $send)) {
+  $result = drupal_mail($module, $key, $to, $language, $params, $from, $send);
+  if ($result['result'] == TRUE) {
     drupal_set_message(t('Your message has been sent.'));
   }
   else {
-    drupal_set_message(t('There was a problem sending your message.'), 'error');
+    drupal_set_message(t('There was a problem sending your message and it was not sent.'), 'error');
   }
 
 }
@@ -116,7 +122,7 @@ function email_example_mail_alter(&$message) {
   // For the purpose of this example, modify all the outgoing messages and
   // attach a site signature. The signature will be translated to the language
   // in which message was built.
-  $message['body'][] = t("--\nMail altered by email_example module.", NULL, $message['language']);
+  $message['body'][] = t("--\nMail altered by email_example module.", NULL, $message['language']->language);
 }
 
 ///// Supporting functions ////
@@ -130,7 +136,7 @@ function email_example_menu() {
   $items['example/email_example'] = array(
     'title' => 'E-mail Example: contact form',
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('email_example_form'), 
+    'page arguments' => array('email_example_form'),
     'access arguments' => array('access content'),
   );
 
diff --git email_example/email_example.test email_example/email_example.test
index be1516e..d2d5bfa 100644
--- email_example/email_example.test
+++ email_example/email_example.test
@@ -9,7 +9,7 @@
  */
 
 /**
- * Functionality tests for examil example module.
+ * Functionality tests for email example module.
  */
 class EmailExampleTestCase extends DrupalWebTestCase {
 
@@ -92,7 +92,8 @@ class EmailExampleTestCase extends DrupalWebTestCase {
       ),
       t('Email signature successfully verified.')
     );
-
   }
-
 }
+
+
+