diff --git a/webform_limit_submissions.module b/webform_limit_submissions.module
index ea734de..c0d11cb 100644
--- a/webform_limit_submissions.module
+++ b/webform_limit_submissions.module
@@ -70,7 +70,8 @@ function webform_limit_submissions_form_submit($form, &$form_state) {
   $node = $form['#parameters'][2]; 
   $submission_limit = $form['submission']['submission_limits']['#value'];
   db_query('DELETE FROM {webform_limit_submissions} WHERE nid = %d', (int) $node->nid);
-  db_query('INSERT INTO {webform_limit_submissions} (nid, sid) VALUES (%d, %d)', (int) $node->nid, (int) $submission_limit);  
+  db_query('INSERT INTO {webform_limit_submissions} (nid, sid) VALUES (%d, %d)', (int) $node->nid, (int) $submission_limit);
+  drupal_set_message(t("Saved configuration."));  
 }
 
 /*
@@ -90,7 +91,8 @@ function _webform_limit_submissions_get_value($nid = NULL) {
  * of the data to the database
  */
 function webform_limit_submissions_nodeapi(&$node, $op, $teaser, $page) {
-  if ($node->type == 'webform') {   
+  $types = webform_variable_get('webform_node_types');
+  if (in_array($node->type, $types)) {   
     if ($op == 'load') {
       
       // Get the value for the limit of submissions
@@ -100,7 +102,7 @@ function webform_limit_submissions_nodeapi(&$node, $op, $teaser, $page) {
       if ($max_submissions > 0) {
         
         // Count the current total of submissions in the database
-        $count = db_result(db_query('SELECT count(*) FROM {webform_submitted_data} WHERE nid = %d', $node->nid));	
+        $count = db_result(db_query('SELECT count(*) FROM {webform_submissions} WHERE nid = %d', $node->nid));	
 
         // Check if the current total of submissions is equal or higher than the value we provided
         if ($count >= $max_submissions) {
@@ -114,4 +116,4 @@ function webform_limit_submissions_nodeapi(&$node, $op, $teaser, $page) {
       db_query('DELETE FROM {webform_limit_submissions} WHERE nid = %d', $node->nid);
     } 
   }
-}
\ No newline at end of file
+}