--- contentanalysis.module.orig	2011-09-10 16:41:00.000000000 -0700
+++ contentanalysis.module	2011-09-11 08:12:43.000000000 -0700
@@ -137,8 +137,8 @@ function contentanalysis_analyze_popup_o
  */
 function contentanalysis_page_analyzer() {
   drupal_add_css(drupal_get_path('module', 'contentanalysis') . '/contentanalysis.admin.css');
-  
-  $output .= drupal_get_form('contentanalysis_page_analyzer_form', $analysis);  
+  $analysis = array();  
+  $output = drupal_get_form('contentanalysis_page_analyzer_form', $analysis);  
   
   return $output;
 }
@@ -158,7 +158,7 @@ function contentanalysis_page_analyzer()
  * @return
  *   form_api formated array
  */
-function contentanalysis_page_analyzer_form($form_state, $analysis) {
+function contentanalysis_page_analyzer_form($form, &$form_state, $analysis) {
   $form['instructions'] = array(
     '#value' => t('You can specify content to be analyzed using one of the three below methods. Use only one method. Either enter text content, use a numeric node id, or provide a URL to an existing webpage.'),
   );
@@ -179,7 +179,7 @@ function contentanalysis_page_analyzer_f
     '#default_value' => ($analysis)?$analysis['#context']['inputs']['url']:'',
   );
   
-  $form = array_merge($form, contentanalysis_analysis_form($form_state, $analysis, array(), 'admin'));
+  $form = array_merge($form, contentanalysis_analysis_form($form, $form_state, $analysis, array(), 'admin'));
  
   return $form;
 }
@@ -205,7 +205,7 @@ function contentanalysis_page_analyzer_f
  *   form_api formated array
  *   
  */
-function contentanalysis_analysis_form($form_state, $analysis = array(), $node = array(), $mode = 'admin') {
+function contentanalysis_analysis_form($form, &$form_state, $analysis = array(), $node = array(), $mode = 'admin') {
   // check the number of calls
   
   drupal_add_js(drupal_get_path('module', 'contentanalysis') . '/contentanalysis.js');
@@ -217,7 +217,7 @@ function contentanalysis_analysis_form($
   $fields = array();
   
   drupal_add_css(drupal_get_path('module', 'contentanalysis') . '/contentanalysis.css');  
-  $display = variable_get('contentanalysis_display', array('sections', 'main'));
+  $display = variable_get('contentanalysis_display', array('sections'=>1, 'main'=>1));
   $analyzers = module_invoke_all('contentanalysis_analyzers');  
   drupal_alter('contentanalysis_analyzers', $analyzers);  
   $analyzer_modules = array();
@@ -246,8 +246,10 @@ function contentanalysis_analysis_form($
   }
 
   // init node value if node/add
-  if(!$node || !$node->nid) {
+  if(empty($node) || empty($node->nid)) {
+	$node = new stdClass();
     $node->nid = 0;
+	$node->type = '';
   }
   
 // hack protecting settings on mutiple calls
@@ -377,8 +379,8 @@ function contentanalysis_get_analyzer_fo
       $defaults[] = $aid;
     }
     $default_value = array();
-    if ($analysis && is_array($analysis['#context']['analyzers'])) {
-      foreach ($analysis['#context']['inputs']['analyzers'] AS $aid => $item) {
+    if ($params && is_array($params['#context']['analyzers'])) {
+      foreach ($params['#context']['inputs']['analyzers'] AS $aid => $item) {
         $default_value[] = $aid;
       }
     } 
@@ -770,7 +772,7 @@ function contentanalysis_parse_context_n
       }
   
       $types['page_title'] = NULL;
-      $context['page_title'] = token_replace_multiple($page_title_pattern, $types);
+      $context['page_title'] = token_replace($page_title_pattern, $types);
     }
   } 
   else {
@@ -1396,7 +1398,7 @@ function contentanalysis_form_alter(&$fo
       '#group' => 'additional_settings',
     );
     
-    $form['contentanalysis'] = array_merge($form['contentanalysis'], contentanalysis_analysis_form($form_state, array(), $node, 'node-edit'));
+    $form['contentanalysis'] = array_merge($form['contentanalysis'], contentanalysis_analysis_form($form, $form_state, array(), $node, 'node-edit'));
     $form['#submit'][] = 'contentanalysis_node_submit';
     //dsm($form);
   }