diff --git a/userpoints_invite/userpoints_invite.info b/userpoints_invite/userpoints_invite.info
index 40ee9a1..32ec772 100644
--- a/userpoints_invite/userpoints_invite.info
+++ b/userpoints_invite/userpoints_invite.info
@@ -3,4 +3,5 @@ description = Users earn points when they invite other, and when others register
 package = Userpoints
 dependencies[] = userpoints
 dependencies[] = invite
-core = 6.x
+core = 7.x
+configure = admin/config/people/userpoints/settings
diff --git a/userpoints_invite/userpoints_invite.install b/userpoints_invite/userpoints_invite.install
index a04445f..775439a 100644
--- a/userpoints_invite/userpoints_invite.install
+++ b/userpoints_invite/userpoints_invite.install
@@ -1,8 +1,10 @@
 <?php
+// $Id$
 
-define('USERPOINTS_INVITE_REGISTER',         'userpoints_invite_register');
-define('USERPOINTS_INVITE_REGISTER_INVITER', 'userpoints_invite_register_inviter');
-define('USERPOINTS_INVITE_REGISTER_INVITEE', 'userpoints_invite_register_invitee');
+/**
+ * @file
+ * Install, update, and uninstall functions for the userpoints_invite menu module.
+ */
 
 /**
  * An update schema - renames the USERPOINTS_INVITE_REGISTER variable to USERPOINTS_INVITE_REGISTER_INVITER
diff --git a/userpoints_invite/userpoints_invite.module b/userpoints_invite/userpoints_invite.module
index 5c737d5..02d0af7 100644
--- a/userpoints_invite/userpoints_invite.module
+++ b/userpoints_invite/userpoints_invite.module
@@ -8,25 +8,19 @@ define('USERPOINTS_INVITE_REGISTER_INVITER',           'userpoints_invite_regist
 define('USERPOINTS_INVITE_REGISTER_INVITEE',           'userpoints_invite_register_invitee');
 define('USERPOINTS_INVITE_REGISTER_REMOVE_ON_DELETE',  'userpoints_invite_register_remove_on_delete');
 
-function userpoints_invite_help($path, $arg) {
-  $output = '';
-  switch ($path) {
-    case 'admin/settings/userpoints_invite':
-      $output = t('A userpoints interface with the invite module.');
-      break;
-  }
-  return $output;
-}
 
 function userpoints_invite_userpoints($op, $params = array()) {
-  switch($op) {
+  switch ($op) {
     case 'setting':
       $group = 'invite';
       $form[$group] = array(
         '#type'        => 'fieldset',
         '#collapsible' => TRUE,
         '#collapsed'   => TRUE,
-        '#title'       => t('!Points for invite (requires the invite module)', userpoints_translation()),
+        '#title'       => t('Invite new users', userpoints_translation()),
+        '#description' => t('!Points for inviting new users (via the invite module)', userpoints_translation()),
+        '#group'       => 'settings_additional',
+        '#weight'      => 24,
       );
 
       $form[$group][USERPOINTS_INVITE_INVITE] = array(
@@ -62,24 +56,35 @@ function userpoints_invite_userpoints($op, $params = array()) {
       $form[$group]['userpoints_invite_tid'] = array(
         '#type'          => 'select',
         '#title'         => t('Category'),
-        '#default_value' => variable_get(userpoints_invite_tid, 0),
+        '#default_value' => variable_get('userpoints_invite_tid', 0),
         '#options'       => userpoints_get_categories(),
         '#description'   => t('Invites will be assigned to this category. You can modify what categories are available by modifying the <a href="!url">Userpoints taxonomy</a>.', 
-          array('!url' => url('admin/content/taxonomy/'. variable_get(USERPOINTS_CATEGORY_DEFAULT_VID, '')))),
+          array('!url' => url('admin/content/taxonomy/' . userpoints_get_vid() ))),
       );
       
       return $form;
   }
 }
 
+/**
+ * Implements hook_userpoints_info()
+ * 
+ */
+function userpoints_invite_userpoints_info() {
+  return array(
+    'userpoints_invite_invite' => array( 'description' => t('sent an invitation')),
+    'userpoints_invite_cancel' => array( 'description' => t('cancelled invitation'))
+  );
+}
+
 function userpoints_invite($op, $args) {
-  switch($op) {
+  switch ($op) {
     case 'invite':
       $points = variable_get(USERPOINTS_INVITE_INVITE, 0);
       $params = array(
         'points'      => $points,
         'uid'         => $args['inviter']->uid,
-        'operation'   => 'invite '.$op,
+        'operation'   => 'userpoints_invite_invite',  // use new 7.x method, name of callback for display 
         'entity_id'   => $args['inviter']->uid,
         'entity_type' => 'user',
         'tid'         => variable_get('userpoints_invite_tid', 0),
@@ -92,7 +97,7 @@ function userpoints_invite($op, $args) {
       $params = array(
         'points'      => $points,
         'uid'         => $args['inviter']->uid,
-        'operation'   => 'invite '.$op,
+        'operation'   => 'userpoints_invite_cancel',  // use new 7.x method, name of callback for display 
         'entity_id'   => $args['inviter']->uid,
         'entity_type' => 'user',
         'tid'         => variable_get('userpoints_invite_tid', 0),
@@ -106,7 +111,7 @@ function userpoints_invite($op, $args) {
       $params = array(
         'points'      => $points,
         'uid'         => $args['inviter']->uid,
-        'operation'   => 'invite '.$op.' invited '.$args['invitee']->uid,
+        'operation'   => 'invite ' . $op . ' invited ' . $args['invitee']->uid,
         'entity_id'   => $args['inviter']->uid,
         'entity_type' => 'user',
         'tid'         => variable_get('userpoints_invite_tid', 0),
@@ -117,7 +122,7 @@ function userpoints_invite($op, $args) {
       $params = array(
         'points'      => $points,
         'uid'         => $args['invitee']->uid,
-        'operation'   => 'invite '.$op. ' invited by '.$args['inviter']->uid,
+        'operation'   => 'invite ' . $op . ' invited by ' . $args['inviter']->uid,
         'entity_id'   => $args['invitee']->uid,
         'entity_type' => 'user',
         'tid'         => variable_get('userpoints_invite_tid', 0),
@@ -129,15 +134,17 @@ function userpoints_invite($op, $args) {
 }
 
 function userpoints_invite_user($op, &$edit, &$account, $category = NULL) {
-  switch($op) {
+  switch ($op) {
     case 'delete':
       if (variable_get(USERPOINTS_INVITE_REGISTER_REMOVE_ON_DELETE, TRUE)) {
-        $uid = db_result(db_query("SELECT uid FROM {userpoints_txn} WHERE operation = '%s' ORDER BY time_stamp DESC LIMIT 1", 'invite register invited '.$account->uid));
+        $uid = db_result(
+           db_query_range("SELECT uid FROM {userpoints_txn} WHERE operation = :op and entity_id = :eid ORDER BY time_stamp DESC", 
+             array(':op'  => 'userpoints_invite_invite', 'eid' => $account->uid), 0, 1 ));
         if ($uid) {
           $params = array(
             'points'      => -(variable_get(USERPOINTS_INVITE_INVITE, 0) + variable_get(USERPOINTS_INVITE_REGISTER_INVITER, 0)),
             'uid'         => $uid,
-            'operation'   => 'invited user '.$account->uid.' deleted',
+            'operation'   => 'invited user ' . $account->uid . ' deleted',
             'entity_id'   => $uid,
             'entity_type' => 'user',
             'tid'         => variable_get('userpoints_invite_tid', 0),