diff --git a/spamagement.admin.inc b/spamagement.admin.inc
index f70c909..5255c80 100644
--- a/spamagement.admin.inc
+++ b/spamagement.admin.inc
@@ -1,12 +1,18 @@
 <?php
-
+// @file
+/**
+ * Callback for admin configuration
+ * Get/Set the variable spamagement_log_successful_registrations
+ *
+ */
 function spamagement_admin() {
   $form = array();
 
   $form['spamagement_log_successful_registrations'] = array(
-    '#type'        => 'checkbox',
-    '#title'       => t('Log name, mail, and IP address for all successful user registrations.'),
+    '#type' => 'checkbox',
+    '#title' => t('Log name, mail, and IP address for all successful user registrations.'),
     '#description' => t('Log the name, mail, and IP address used during registration for all successful user registration attempts. This can be helpful in identifying the source of spam registrations that get past other filters that may be enabled on your site.'),
+    '#default_value' => variable_get('spamagement_log_successful_registrations', NULL),
   );
 
   return system_settings_form($form);
diff --git a/spamagement.info b/spamagement.info
index b53670f..fd7c667 100644
--- a/spamagement.info
+++ b/spamagement.info
@@ -1,3 +1,6 @@
 name = Spamagement
 description = A collection of tools to help manage spam that doesn't get blocked by other tools.
 core = 7.x
+
+dependencies[] = views_bulk_operations
+dependencies[] = admin_views
diff --git a/spamagement.module b/spamagement.module
index ba0414f..558b564 100644
--- a/spamagement.module
+++ b/spamagement.module
@@ -71,53 +71,57 @@ function spamagement_user_insert(&$edit, $account, $category) {
  * - Delete the user account.
  */
 function spamagement_wipe_user(&$node, $context = array()) {
+  global $user;
   $uid = $node->uid;
-
-  watchdog('spamagement', 'Performing Spamagement user wipe for user :uid', array(':uid' => $uid), WATCHDOG_INFO);
-
-  $batch = array(
-    'operations'   => array(),
-    'finished'     => 'spamagement_wipe_user_finished',
-    'title'        => t('Wiping spam user'),
-    'init_message' => t('Initializing spam user wipe'),
-    'progress_message' => t('Processed @current out of @total.'),
-    'error_message'    => t('Spam user wipe has encountered an error.'),
-  );
-
-  // Load all the NIDs.
-  $nids = array();
-  $result = db_query('SELECT n.nid FROM {node} n WHERE n.uid = :uid', array(':uid' => $uid));
-  foreach ($result as $record) {
-    $nids[] = $record->nid;
+  if ($uid == 1 || $user->uid == $uid) {
+    watchdog('spamagement', 'You cann\'t delete the content created by you or user id 1', WATCHDOG_ERROR);
   }
-  $batch['operations'][] = array('spamagement_wipe_user_nodes', array($nids));
-
-  watchdog('spamagement', 'Queueing :count nodes for deletion', array(':count' => count($nids)), WATCHDOG_INFO);
-
-  // Load all the CIDs.
-  $cids = array();
-  $result = db_query('SELECT c.cid FROM {comment} c WHERE c.uid = :uid', array(':uid' => $uid));
-  foreach ($result as $record) {
-    $cids[] = $record->cid;
+  else {
+    watchdog('spamagement', 'Performing Spamagement user wipe for user :uid', array(':uid' => $uid), WATCHDOG_ERROR);
+
+    $batch = array(
+      'operations' => array(),
+      'finished' => 'spamagement_wipe_user_finished',
+      'title' => t('Wiping spam user'),
+      'init_message' => t('Initializing spam user wipe'),
+      'progress_message' => t('Processed @current out of @total.'),
+      'error_message' => t('Spam user wipe has encountered an error.'),
+    );
+
+    // Load all the NIDs.
+    $nids = array();
+    $result = db_query('SELECT n.nid FROM {node} n WHERE n.uid = :uid', array(':uid' => $uid));
+    foreach ($result as $record) {
+      $nids[] = $record->nid;
+    }
+    $batch['operations'][] = array('spamagement_wipe_user_nodes', array($nids));
+
+    watchdog('spamagement', 'Queueing :count nodes for deletion', array(':count' => count($nids)), WATCHDOG_INFO);
+
+    // Load all the CIDs.
+    $cids = array();
+    $result = db_query('SELECT c.cid FROM {comment} c WHERE c.uid = :uid', array(':uid' => $uid));
+    foreach ($result as $record) {
+      $cids[] = $record->cid;
+    }
+    $batch['operations'][] = array('spamagement_wipe_user_comments', array($cids));
+
+    watchdog('spamagement', 'Queueing :count comments for deletion', array(':count' => count($cids)), WATCHDOG_INFO);
+
+    // Delete the user account.
+    $batch['operations'][] = array('spamagement_wipe_user_user', array($uid));
+
+    watchdog('spamagement', 'Setting up the batch', array(), WATCHDOG_INFO);
+    batch_set($batch);
   }
-  $batch['operations'][] = array('spamagement_wipe_user_comments', array($cids));
-
-  watchdog('spamagement', 'Queueing :count comments for deletion', array(':count' => count($cids)), WATCHDOG_INFO);
-
-  // Delete the user account.
-  $batch['operations'][] = array('spamagement_wipe_user_user', array($uid));
-
-  watchdog('spamagement', 'Setting up the batch', array(), WATCHDOG_INFO);
-  batch_set($batch);
-
-  /*
-  watchdog('spamagement', 'Processing the batch', array(), WATCHDOG_INFO);
-  batch_process('<front>');
-
-  watchdog('spamagement', 'Done processing the batch', array(), WATCHDOG_INFO);
-  */
 }
 
+/**
+ * Callback to remove nodes
+ * @param array $nids
+ * @param type $context
+ * @return type
+ */
 function spamagement_wipe_user_nodes(array $nids, &$context) {
   watchdog('spamagement', 'Running spamagement_wipe_user_nodes', array(), WATCHDOG_INFO);
 
@@ -157,6 +161,12 @@ function spamagement_wipe_user_nodes(array $nids, &$context) {
   $context['sandbox']['current_key'] += $limit;
 }
 
+/**
+ * callback to remove comments
+ * @param array $cids
+ * @param type $context
+ * @return type
+ */
 function spamagement_wipe_user_comments(array $cids, &$context) {
   watchdog('spamagement', 'Running spamagement_wipe_user_comments', array(), WATCHDOG_INFO);
 
@@ -196,9 +206,15 @@ function spamagement_wipe_user_comments(array $cids, &$context) {
   $context['sandbox']['current_key'] += $limit;
 }
 
+/**
+ * Callback to delete users
+ * @param type $uid
+ * @param type $context
+ */
 function spamagement_wipe_user_user($uid, &$context) {
   watchdog('spamagement', 'Running spamagement_wipe_user_user', array(), WATCHDOG_INFO);
   _user_cancel(array(), user_load($uid), 'user_cancel_delete');
   $context['results'][] = t('Removed user account.');
   $context['finished'] = 1;
 }
+