diff -urp freelinking-hooks/freelinking.module freelinking/freelinking.module
--- freelinking-hooks/freelinking.module	2009-10-23 00:18:22.398406625 -0700
+++ freelinking/freelinking.module	2009-10-23 00:47:13.592732447 -0700
@@ -98,15 +98,18 @@ function freelinking_settings() {
 
   // loop through plugin settings functions, adding a fieldset for each
   $plugin_with_settings = module_invoke_all('freelinking_settings');
-  foreach ($plugin_with_settings as $plugin => $form_element) {
+  foreach ($plugin_with_settings as $plugin => $plugin_form) {
     $form[$plugin] = array(
-      '#title' => t('Settings for ' . $plugin . ' plugin'),
+      '#title' => t('Settings for !plugin plugin', array('!plugin' => ucfirst($plugin))),
       '#type'  => 'fieldset',
       '#collapsible' => TRUE,
       '#collapsed' => FALSE,
      );
-    $form[$plugin]['settings'] = $form_element;
+    foreach($plugin_form as $form_element) {
+      $form[$plugin]['settings'] = $form_element;
+    }
   } // endforeach looping through plugins with settings
+  // return system_settings_form($form);
 
   return system_settings_form($form);
 } // endfunction freelinking_settings (admin settings)
@@ -177,22 +180,22 @@ function freelinking_nodetitle_callback(
 }
 
 function freelinking_freelinking_settings() { // settings for the nodetitle plugin
-  $form['freelinking_nodetitle_newcontenttype'] = array(
+  $form['nodetitle']['freelinking_nodetitle_newcontenttype'] = array(
     '#title' => t('Default for new content'),
     '#type'  => 'select',
     '#options' => node_get_types('names'),
     '#default_value' => variable_get('freelinking_nodetitle_newcontenttype', 'story'),
     '#description'  => t('Content that is to be created from a freelink should be of this type.'),
   );
-  $form['freelinking_nodetitle_searchcontenttype'] = array(
+  $form['nodetitle']['freelinking_nodetitle_searchcontenttype'] = array(
     '#title' => t('Restrict freelinks to this content type'),
     '#type'  => 'select',
     '#options' => array_merge(array('none' => t('No restriction')), node_get_types('names')),
     '#default_value' => variable_get('freelinking_nodetitle_searchcontenttype', 'none'),
     '#description' => t('Lookup by title to find a freelink will be restricted to this content type only.'),
   );
-  $form['freelinking_nodetitle_notfoundaction'] = array(
-    '#title' => t('If a suitable content is not found:'),
+  $form['nodetitle']['freelinking_nodetitle_notfoundaction'] = array(
+    '#title' => t('If a suitable content is not found'),
     '#type' => 'select',
     '#options' => array(
       'create' => t('Only try to create content. Do not search for content. May give a 403 if the user does not have permission'),
@@ -202,7 +205,6 @@ function freelinking_freelinking_setting
     '#default_value' => variable_get('freelinking_nodetitle_notfoundaction', 'create'),
     '#description' => t('What should freelinking do when content to link to is not found?'),
   );
-
   return $form;
 } // endfunction freelinking_freelinking_settings()
 
Only in freelinking/: freelinking_plugins.tar.gz
diff -urp freelinking-hooks/freelinking.module freelinking/freelinking.module
--- freelinking-hooks/plugins/freelinking_nid.module	2009-10-23 00:18:22.398406625 -0700
+++ freelinking/plugins/freelinking_nid.module	2009-10-23 00:43:46.897277866 -0700
@@ -42,7 +42,7 @@ function freelinking_nid_callback($targe
  * Configuration settings for link tooltips
  */
 function freelinking_nid_freelinking_settings() { // settings for the nid plugin
-  $form['freelinking_nid_title_text'] = array(
+  $form['nid']['freelinking_nid_title_text'] = array(
     '#title' => t('Insert tooltip text.'),
     '#type' => 'checkbox',
     '#default_value' => variable_get('freelinking_nid_title_text', false),
diff -urp freelinking-hooks/freelinking.module freelinking/freelinking.module
--- freelinking-hooks/plugins/freelinking_wikipedia.module	2009-10-23 00:18:22.398406625 -0700
+++ freelinking/plugins/freelinking_wikipedia.module	2009-10-23 00:44:05.342639537 -0700
@@ -14,7 +14,7 @@ function freelinking_wikipedia_freelinki
   return $freelinking;
 }
 function freelinking_wikipedia_freelinking_settings() {
-  $form['freelinking_wikipedia_languagecode'] = array(
+  $form['wikipedia']['freelinking_wikipedia_languagecode'] = array(
     '#title' => t('Language code'),
     '#type'  => 'textfield',
     '#default_value' => variable_get('freelinking_wikipedia_languagecode', 'en'),