diff --git a/amazon_ses.admin.inc b/amazon_ses.admin.inc
index 1d393eb..909fc95 100644
--- a/amazon_ses.admin.inc
+++ b/amazon_ses.admin.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 /**
  * @file
  * Administrative forms for Amazon SES module.
@@ -69,7 +68,7 @@ function amazon_ses_admin_settings() {
 
   $formats = filter_formats();
   $options = array();
-  foreach ($formats AS $v => $format) {          
+  foreach ($formats AS $v => $format) {
     $options[$v] = $format->name;
   }
   $form['email_options']['amazon_ses_filter_format'] = array(
@@ -90,7 +89,11 @@ function amazon_ses_admin_settings() {
     '#type' => 'textfield',
     '#title' => t('Email address to send a test email to'),
     '#default_value' => '',
-    '#description' => t('Type in an address to have a test email sent there.'),
+    '#description' => t('Type in an address to have a test email sent there.
+      Note: you can only send to verified email addresses if your Amazon AWS
+      account has not been granted !link.',
+      array('!link' => l('production access', 'http://aws.amazon.com/ses/fullaccessrequest'))
+    ),
   );
   $form['email_test']['amazon_ses_test_body'] = array(
     '#type' => 'textarea',
@@ -158,6 +161,7 @@ function amazon_ses_admin_settings_submit($form, &$form_state) {
  *   A keyed array containing the current state of the form.
  */
 function amazon_ses_admin_new_address_submit($form, &$form_state) {
+  libraries_load('awssdk');
   $address = $form_state['values']['new_address'];
   if ($address) {
     $amazon_ses = new AmazonSES();
@@ -169,16 +173,24 @@ function amazon_ses_admin_new_address_submit($form, &$form_state) {
 }
 
 function amazon_ses_admin_info() {
-  if ($addresses = amazon_ses_verified_addresses()) {
-    $rows = array();
-    if (in_array(variable_get('amazon_ses_from', ''), $addresses)) {
-      $rows[] = array('Ready to send email', '<span style="color: #00ff00; font-weight: bold;">YES</span>');
-    }
-    else {
-      $rows[] = array('Ready to send email', '<span style="color: #ff0000; font-weight: bold;">NO</span>');
-      $rows[] = array(array('data' => 'You must specify an alternate Email from address below, or takes steps to verify your site\'s email address with Amazon AWS.', 'colspan' => 2));
-    }
+  $rows = array();
+  $addresses = amazon_ses_verified_addresses();
+  $from = variable_get('amazon_ses_from', '');
+  if (!empty($addresses) && in_array($from, $addresses)) {
+    $rows[] = array('Ready to send email', '<span style="color: #00ff00; font-weight: bold;">YES</span>');
+  }
+  else {
+    $rows[] = array('Ready to send email', '<span style="color: #ff0000; font-weight: bold;">NO</span>');
+  }
+
+  if (empty($addresses)) {
+    $rows[] = array(array('data' => 'You must verify your site\'s email address with Amazon AWS.', 'colspan' => 2));
+  }
+  else {
     $rows[] = array('Verified email addresses', theme('item_list', array('items' => $addresses)));
+    if (empty($from)) {
+      $rows[] = array(array('data' => 'You must specify a verified address to use as the default "from" address.'));
+    }
   }
 
   return theme('table', array('rows' => $rows)) . l(t('View Amazon SES statistics'), 'admin/reports/amazon_ses');
@@ -228,6 +240,7 @@ function amazon_ses_admin_stats() {
 }
 
 function amazon_ses_verified_addresses() {
+  libraries_load('awssdk');
   $amazon_ses = new AmazonSES();
   $verified_addresses = $amazon_ses->list_verified_email_addresses();
   if ($verified_addresses->isOK()) {
@@ -245,6 +258,7 @@ function amazon_ses_verified_addresses() {
 }
 
 function amazon_ses_quota() {
+  libraries_load('awssdk');
   $amazon_ses = new AmazonSES();
   $quota = $amazon_ses->get_send_quota();
   if ($quota->IsOK()) {
@@ -253,6 +267,7 @@ function amazon_ses_quota() {
 }
 
 function amazon_ses_send_statistics() {
+  libraries_load('awssdk');
   $amazon_ses = new AmazonSES();
   $stats = $amazon_ses->get_send_statistics();
   if ($stats->IsOK()) {
diff --git a/amazon_ses.info b/amazon_ses.info
index be1e4c6..1f3f83e 100644
--- a/amazon_ses.info
+++ b/amazon_ses.info
@@ -2,11 +2,7 @@
 name = Amazon SES
 description = "Allow for site emails to be sent through Amazon SES."
 core = 7.x
-dependencies[] = creeper
 package = Mail
 configure = admin/config/system/amazon-ses
-files[] = amazon_ses.module
-files[] = amazon_ses.admin.inc
-files[] = amazon_ses.mail.inc
-files[] = amazon_ses.phpmailer.inc
-files[] = amazon_ses.transport.inc
\ No newline at end of file
+dependencies[] = awssdk
+files[] = amazon_ses.mail.inc
\ No newline at end of file
diff --git a/amazon_ses.install b/amazon_ses.install
index c8043ef..8e53cad 100644
--- a/amazon_ses.install
+++ b/amazon_ses.install
@@ -14,11 +14,6 @@ function amazon_ses_install() {
 }
 
 /**
- * @file
- * The uninstallation instructions for Amazon SES.
- */
-
-/**
  * Implements hook_uninstall().
  */
 function amazon_ses_uninstall() {
diff --git a/amazon_ses.mail.inc b/amazon_ses.mail.inc
index 05ae29b..a5c5905 100644
--- a/amazon_ses.mail.inc
+++ b/amazon_ses.mail.inc
@@ -129,6 +129,7 @@ class AmazonSESMailSystem implements MailSystemInterface {
       drupal_set_message(t('Sending mail to: @to.', array('@to' => $destination['ToAddresses'][0])), 'notice');
     }
 
+    libraries_load('awssdk');
     $mailer = new AmazonSES();
     $status = $mailer->send_email($source, $destination, $ses_message, $opt);