diff --git a/freelinking.api.php b/freelinking.api.php
index 436323a..2aa881f 100644
--- a/freelinking.api.php
+++ b/freelinking.api.php
@@ -15,7 +15,7 @@
  * @see http://drupal.org/node/???
  */
 function hook_freelinking() {
-  $plugins['myplugin'] array(
+  $plugins['myplugin'] = array(
     'indicator' => '/myplugin/',
     'translate' => array(' ' => '_'),
     'replacement' => 'http://example.com/node/%1',
diff --git a/modules/freelinking_prepopulate/freelinking_prepopulate.info b/modules/freelinking_prepopulate/freelinking_prepopulate.info
index c12734d..9b4abbb 100644
--- a/modules/freelinking_prepopulate/freelinking_prepopulate.info
+++ b/modules/freelinking_prepopulate/freelinking_prepopulate.info
@@ -6,20 +6,6 @@ dependencies[] = freelinking
 dependencies[] = prepopulate
 
 
-; Information added by drupal.org packaging script on 2009-11-25
-version = "6.x-3.x-dev"
-core = 7.x
-project = "freelinking"
-datestamp = "1259150922"
-
-
-; Information added by drupal.org packaging script on 2010-03-31
-version = "6.x-3.x-dev"
-core = 7.x
-project = "freelinking"
-datestamp = "1269994094"
-
-
 files[] = freelinking_prepopulate.api.php
 files[] = freelinking_prepopulate.install
 files[] = freelinking_prepopulate.module
diff --git a/modules/freelinking_prepopulate/freelinking_prepopulate.module b/modules/freelinking_prepopulate/freelinking_prepopulate.module
index e2147d5..526a30e 100644
--- a/modules/freelinking_prepopulate/freelinking_prepopulate.module
+++ b/modules/freelinking_prepopulate/freelinking_prepopulate.module
@@ -32,7 +32,7 @@ function freelinking_prepopulate_freelinking() {
  */
 function freelinking_prepopulate_node_callback($target, $plugin) {
   // Use specified node type or fallback to configuration.
-  if ($target['type']) {
+  if (isset($target['type']))  {
     $node_type = check_plain($target['type']);
   }
   else {
@@ -60,7 +60,8 @@ function freelinking_prepopulate_node_callback($target, $plugin) {
   $query['edit[title]'] = check_plain($target['dest']);
 
   // Use arguments targeted for Prepopulate or get values from current node/page.
-  if (is_array($target['other']['prepopulate'])) {
+  //kpr($target['other']['prepopulate']);
+  if (isset($target['other']['prepopulate']) && is_array($target['other']['prepopulate'])) {
     foreach ($target['other']['prepopulate'] as $field => $value) {
       $query[$field] = $value;
     }
@@ -75,11 +76,13 @@ function freelinking_prepopulate_node_callback($target, $plugin) {
   // This is not currently restricted by advanced settings, just by the ability
   // of the FL_P API to recognize arguments from $target
   $query_override = freelinking_prepopulate_fields_from_array('nodecreate', $target);
+  if (isset($query_override)) {
   foreach ($query_override as $key => $value) {
     if ($value) {
       $query[$key] = $value;
     }
   }
+}
   return array($title, $url, array(
       'query' => $query,
       'attributes' => array(
@@ -101,13 +104,17 @@ function freelinking_prepopulate_node_settings() {
     '#description' => t('Which content type should be created by Freelinking?'),
   );
 
-  foreach (freelinking_prepopulate_list_fields('nodecreate') as $key => $value) {
+
+$nodecreate[] = freelinking_prepopulate_list_fields('nodecreate');
+if (isset($nodecreate)) {
+  foreach ($nodecreate as $key => $value) {
     $options[$key] = $value['title'];
   }
+}
   if (empty($options)) {
     return $form;
   }
-
+/* What does this one do? Did not find a usage commented it out.
   $form['freelinking_prepopulate_node_advanced'] = array(
     '#type' => 'checkboxes',
     '#title' => t('Advanced Options'),
@@ -115,6 +122,8 @@ function freelinking_prepopulate_node_settings() {
     '#options' => $options,
     '#description' => t('Use the <em>Linking Node</em> for Create Node presets.'),
   );
+ *
+ */
   return $form;
 }
 
@@ -123,6 +132,7 @@ function freelinking_prepopulate_node_settings() {
  * Gets the first available type
  */
 function _freelinking_prepopulate_default_node_type() {
+  $types = array();
   $types = node_type_get_names();
-  return $types[0];
+  return reset($types);
 }
diff --git a/modules/freelinking_prepopulate/freelinking_prepopulate.utilities.inc b/modules/freelinking_prepopulate/freelinking_prepopulate.utilities.inc
index 60949eb..117e32e 100644
--- a/modules/freelinking_prepopulate/freelinking_prepopulate.utilities.inc
+++ b/modules/freelinking_prepopulate/freelinking_prepopulate.utilities.inc
@@ -27,14 +27,13 @@ function freelinking_prepopulate_fields_from_page($fields, $plugin = 'nodecreate
   $query = array();
   $index = $plugin . serialize($fields);
   if (!$prepopulate[$index]) {
+if (is_array(freelinking_prepopulate_list_fields($plugin))) {
     $prepopulate[$index] = array_intersect_key(freelinking_prepopulate_list_fields($plugin), $fields);
   }
+}
 
-  if ($plugin == 'nodecreate' && arg(0) == 'node' && is_numeric(arg(1)) && !arg(2)) {
-    $object = node_load(arg(1));
-  }
-
-  foreach ($prepopulate[$index] as $field => $definition) {
+  if (isset($prepopulate[$index]) && is_array($prepopulate[$index])) {
+    foreach ($prepopulate[$index] as $field => $definition) {
     switch ($field) {
       case 'og':
         $group = og_get_group_context();
@@ -60,6 +59,7 @@ function freelinking_prepopulate_fields_from_page($fields, $plugin = 'nodecreate
         break;
     }
   }
+  }
   return $query;
 }
 
@@ -75,7 +75,10 @@ function freelinking_prepopulate_fields_from_page($fields, $plugin = 'nodecreate
  */
 function freelinking_prepopulate_fields_from_array($plugin, $target) {
   $query = array();
-  $prepopulate = array_intersect_key(freelinking_prepopulate_list_fields($plugin), $target);
+  if (is_array($target && freelinking_prepopulate_list_fields($plugin))) {
+    $prepopulate[] = array_intersect_key(freelinking_prepopulate_list_fields($plugin), $target);
+  }
+  if (isset($prepopulate)) {
   foreach ($prepopulate as $field => $values) {
     // If it's an organic group, break the groups out to separate values.
     if ($field == 'og') {
@@ -101,10 +104,10 @@ function freelinking_prepopulate_fields_from_array($plugin, $target) {
     }
   }
   return $query;
+  }
 }
 
 
-
 /**
  * Build & retrieve the list of form fields for URL construction.
  * This is made with Prepopulate in mind, but is not restricted to Prepopulate.
@@ -182,6 +185,7 @@ function freelinking_prepopulate_list_fields($plugin = 'nodecreate', $field = NU
       // To Be Implemented
     }
   }
-
+if (is_array($fields && $plugins[$plugin])) {
   return array_intersect_key($fields, $plugins[$plugin]);
+  }
 }
diff --git a/plugins/freelinking_nodetitle.inc b/plugins/freelinking_nodetitle.inc
index 7e65b54..dc240fc 100644
--- a/plugins/freelinking_nodetitle.inc
+++ b/plugins/freelinking_nodetitle.inc
@@ -19,7 +19,7 @@ $freelinking['nodetitle'] = array(
  */
 function freelinking_nodetitle_callback($target, $plugin) {
   $node = freelinking_nodetitle_nid_from_title($target);
-  
+
   // if no node was found, identify proceed with configured failover
   if (!$node) {
     return _freelinking_nodetitle_failure($target);
@@ -27,7 +27,7 @@ function freelinking_nodetitle_callback($target, $plugin) {
 
   // construct values for link
   $title = $target['text'] ? $target['text'] : $node->title;
-  
+
   if (!$target['tooltip']) {
     $target['tooltip'] = freelinking_internal_tooltip('node', $node->nid);
   }
@@ -53,6 +53,8 @@ function freelinking_nodetitle_settings() {
 
   $failover_option['none'] = t('Do nothing');
 
+  $extra_description = '';
+
   // if Create Node plugin is available, it's an option!
   if (module_exists('freelinking_prepopulate')) {
     $failover_option['create'] = t('Add a link to create content. (Without Permission: Access Denied)');
@@ -68,7 +70,7 @@ function freelinking_nodetitle_settings() {
     $failover_option['search'] = t('Add a link to Search Content');
   }
   else {
-    $extra_description .= '<br /><strong>'
+    $extra_description = '<br /><strong>'
       . t('Note: Enable the %module module for internal search option.', array('%module' => 'Search'))
       . '</strong>';
     // if search is unavailable offer it's own (applicable)search fallback. [Google, etc]
@@ -125,7 +127,7 @@ function freelinking_nodetitle_nid_from_title(&$target) {
   // language restriction. Includes next-best-language logic.
   $language = array(language_default('language'), '');
   if (module_exists('locale')) {
-    if ($target['language']) {
+    if (isset($target['language'])) {
       array_unshift($language, $target['language']);
     }
     foreach ($language as $priority) {
@@ -167,7 +169,7 @@ function _freelinking_nodetitle_failure($target) {
  * Find the best default failover
  */
 function _freelinking_nodetitle_default_failover() {
-  if (module_exists('freelinking_create')) {
+  if (module_exists('freelinking_prepopulate')) {
     return 'create node';
   }
   elseif (module_exists('search')) {
@@ -175,5 +177,3 @@ function _freelinking_nodetitle_default_failover() {
   }
   return 'none';
 }
-
-// vim: tw=300 nowrap syn=php