diff --git a/sites/all/modules/contentanalysis/contentanalysis.admin.css b/sites/all/modules/contentanalysis/contentanalysis.admin.css
deleted file mode 100644
index e69de29..0000000
diff --git a/sites/all/modules/contentanalysis/contentanalysis.css b/sites/all/modules/contentanalysis/contentanalysis.css
index 45811f9..e4bf66e 100644
--- a/sites/all/modules/contentanalysis/contentanalysis.css
+++ b/sites/all/modules/contentanalysis/contentanalysis.css
@@ -21,8 +21,16 @@
   letter-spacing: normal;
   padding: 0.25em 1em;
   -moz-border-radius-topleft: 0.5em;
+  -webkit-border-radius-topleft: 0.5em;
+  -o-border-radius-topleft: 0.5em;
   -moz-border-radius-topright: 0.5em;
+  -webkit-border-radius-topright: 0.5em;
+  -o-border-radius-topright: 0.5em;
+  -moz-border-top-left-radius: 0.5em;
+  -o-border-top-left-radius: 0.5em;
   -webkit-border-top-left-radius: 0.5em;
+  -moz-border-top-right-radius: 0.5em;
+  -o-border-top-right-radius: 0.5em;
   -webkit-border-top-right-radius: 0.5em;
 }
 
@@ -66,6 +74,7 @@
   border: solid 1px #ddd;
   -webkit-border-radius: 0.5em;
   -moz-border-radius: 0.5em;
+  -moz-box-shadow: -1em 1em 1em rgba(0, 0, 0, 0.5);
   -webkit-box-shadow: -1em 1em 1em rgba(0, 0, 0, 0.5);
   position: relative;
   display: block;
@@ -134,15 +143,6 @@ div.analysis-results .analyzer-analysis {
   display: none;
 }
 
-/* ??? not sure this is used anymore
-div.page-analysis .analyzers {
-  display: none;
-}
-div.page-analysis div.analysis-results .analyzer-analysis  {
-  display: block;
-}
-*/
-
 /*
  * modal reports section styles
  */
@@ -153,14 +153,8 @@ div.page-analysis div.analysis-results .analyzer-analysis  {
 #modalContent .contentanalysis-results {
   position: absolute;
   margin-top: 3px;
-  /* border: 2px solid green; */
   float: left;
   clear: left;
-  /*
-  margin-top: 40px;
-  margin-top: 0\9;  /*IE hack
-  top: 40px\9;
-  */
 }
 
 /* tabs */
@@ -177,7 +171,6 @@ div.page-analysis div.analysis-results .analyzer-analysis  {
   -moz-border-radius-topright: 0.5em;
   border-radius-topleft: 0.5em;
   border-radius-topright: 0.5em;
-  /* display: inline; */
   float: left;
   cursor: pointer;
   padding: 3px 10px 2px 10px;
@@ -194,24 +187,6 @@ div.page-analysis div.analysis-results .analyzer-analysis  {
   background-color: #fff;
 }
 
-/*???
-.content-analysis-results {
-  display: none;
-  position: absolute;
-  margin-top: 50px;
-  clear: both;
-}
-
-.page-analysis .content-analysis-results {
-  display: block;
-  position: relative;
-}
-.page-analysis div.analysis-results {
-  margin-left: 10px;
-  margin-top: 0px;
-}
-*/
-
 /* status report table */
 
 .contentanalysis_stats {
@@ -237,7 +212,7 @@ div.page-analysis div.analysis-results .analyzer-analysis  {
 .contentanalysis-results table {
   border: 1px solid #e0e0e0;
   border-collapse: separate;
-  border-spacing: 0px;
+  border-spacing: 0;
   background: #fff;
 }
 
@@ -261,7 +236,6 @@ div.page-analysis div.analysis-results .analyzer-analysis  {
 
 .contentanalysis-results table tbody tr td {
   border-bottom: 1px solid #e0e0e0;
-  /* background-color: #FFFFFF; */
 }
 
 .contentanalysis-results table tbody tr:last-child td {
@@ -325,11 +299,9 @@ div.page-analysis div.analysis-results .analyzer-analysis  {
 .analysis-results .status_report .messages .warning,
 .analysis-results .status_report .messages .error {
   padding-left: 50px;
-  background-repeat: no-repeat;
-  background-position: 15px center;
+  background: no-repeat 15px center;
   min-height: 16px;
-  list-style-image: none;
-  list-style-type: none;
+  list-style: none none;
 }
 
 /* inline report styling */
@@ -349,8 +321,7 @@ fieldset.contentanalysis_section_analysis .fieldset-legend {
 #content .analysis-results .status_report .messages li.warning,
 #content .analysis-results .status_report .messages li.error {
   padding-left: 50px;
-  background-repeat: no-repeat;
-  background-position: 15px center;
+  background: no-repeat 15px center;
   min-height: 16px;
 }
 
@@ -362,12 +333,12 @@ fieldset.contentanalysis_section_analysis .fieldset-legend {
 
 #content .contentanalysis_analysis .status_report ul li {
   list-style: none outside none;
-  margin-left: 0px;
+  margin-left: 0;
 }
 
 #modal-content .contentanalysis-results .status_report ul li {
   list-style: none outside none;
-  margin-left: 0px;
+  margin-left: 0;
 }
 
 .analysis-results .status_report .status {
@@ -425,7 +396,11 @@ a.contentanalysis-button {
 .contentanalysis-button {
   text-shadow: 0 1px 0 #FFFFFF;
   -moz-border-radius: 11px 11px 11px 11px;
+  -webkit-border-radius: 11px 11px 11px 11px;
+  -o-border-radius: 11px 11px 11px 11px;
   -moz-box-sizing: content-box;
+  -webkit-box-sizing: content-box;
+  -o-box-sizing: content-box;
   border-style: solid;
   border-width: 1px;
   cursor: pointer;
@@ -440,7 +415,6 @@ a.contentanalysis-button {
 }
 
 .contentanalysis-button:hover {
-  /* border-color:#666666; */
   color: #FF4444;
 }
 
diff --git a/sites/all/modules/contentanalysis/contentanalysis.js b/sites/all/modules/contentanalysis/contentanalysis.js
index 501ccc5..8436a0e 100644
--- a/sites/all/modules/contentanalysis/contentanalysis.js
+++ b/sites/all/modules/contentanalysis/contentanalysis.js
@@ -26,7 +26,6 @@ var contentanalysis = contentanalysis || {};
 
     contentanalysis_back:function () {
       $$.contentanalysis_show_analyzer_tab(contentanalysisPrevAnalyzerTab);
-      //contentanalysis_show_report_tab(contentanalysisPrevReportTab);
     },
 
     contentanalysis_show_analyzer_tab:function (theTab) {
@@ -60,7 +59,6 @@ var contentanalysis = contentanalysis || {};
       $('.contentanalysis-results-section').hide();
 
       var tabs = $("#contentanalysis-report-tabs-" + e[3]);
-      //tabs.css('border','2px solid red');
       var pos = $("#contentanalysis-report-tabs-" + e[3]).position();
       var offset = $("#contentanalysis-report-tabs-" + e[3]).offset();
       var height = tabs.height();
@@ -69,11 +67,8 @@ var contentanalysis = contentanalysis || {};
 
       var sec_id = id.replace('tab', 'results');
       var result_id = sec_id.replace('-' + e[4], '')
-      //$('#' + result_id).css({'top': top, 'left': left}); 
       $('#' + result_id).css('top', top);
-      //$('#' + result_id).css('border', '2px solid green'); 
       $('#' + sec_id).show();
-      //alert("pos.left="+pos.left+",pos.top="+pos.top+",offset.left="+offset.left+",offset.top="+offset.top);
       $$.contentanalysisPrevReportTab = $$.contentanalysisCurrentReportTab;
       $$.contentanalysisCurrentReportTab = theTab;
     },
@@ -105,7 +100,6 @@ var contentanalysis = contentanalysis || {};
     contentanalysis_refresh_analysis:function (analyzer) {
       Drupal.settings.contentanalysis.display_dialog = 0;
       Drupal.settings.contentanalysis.display_inline = 1;
-      //$('.contentanalysis-refresh-link-' + analyzer).replaceWith('<span class="throbber">Loading...</span>');
       $('.contentanalysis-refresh-link-' + analyzer).replaceWith('<div class="ahah-progress ahah-progress-throbber"><div class="throbber">&nbsp;</div></div>');
       $$.contentanalysis_analyze(analyzer);
     },
diff --git a/sites/all/modules/contentanalysis/contentanalysis.module b/sites/all/modules/contentanalysis/contentanalysis.module
index 1ecd8b2..cc3d2d0 100644
--- a/sites/all/modules/contentanalysis/contentanalysis.module
+++ b/sites/all/modules/contentanalysis/contentanalysis.module
@@ -46,7 +46,8 @@ function contentanalysis_menu() {
   $items['admin/reports/contentanalysis'] = array(
     'title' => 'Content analysis',
     'description' => 'Analyze nodes, web pages and free form content.',
-    'page callback' => 'contentanalysis_page_analyzer',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('contentanalysis_page_analyzer'),
     'access callback' => 'user_access',
     'access arguments' => array('perform content analysis'),
     'type' => MENU_NORMAL_ITEM,
@@ -72,45 +73,6 @@ function contentanalysis_menu() {
     'access arguments' => array('perform content analysis'),
     'type' => MENU_CALLBACK,
   );
-  $items['contentanalysis/util'] = array(
-    'title' => 'Contentanalysis util',
-    'page callback' => 'contentanalysis_util',
-    'access callback' => 'user_access',
-    'access arguments' => array('admin'),
-    'type' => MENU_CALLBACK,
-  );
-  return $items;
-}
-
-function contentanalysis_util() {
-
-  return 'ok';
-  $node = node_load(2);
-  $options = array(
-    'entity_type' => 'node',
-    'entity' => $node,
-    'view_mode' => 'full',
-    'display_mode' => 'full',
-    'token data' => array(
-      'node' => $node,
-    )
-  );
-  $metatags = array(
-    'title' => array(
-      'value' => '[node:title] YES [site:name]',
-    ),
-    'keywords' => array(
-      'value' => 'echo, foxtrot',
-    ),
-    'description' => array(
-      'value' => 'YES [node:summary]',
-    ),
-  );
-
-  $ret = metatag_metatags_view('global', array());
-  $ret = metatag_metatags_view('node:article', $metatags, $options);
-
-  return 'ok';
 }
 
 /**
@@ -156,7 +118,7 @@ function contentanalysis_modal_popup_only() {
   $html = '<div id="analysis-modal">' . theme('progress_bar', array(
     'percent' => 0,
     'message' => t('Analyzing Content')
-  )) . '</div>' . $output .
+  )) . '</div>' .
     '<script type="text/javascript">contentanalysis.contentanalysis_dialog_analysis();</script>';
   $output[] = ctools_modal_command_display($title, $html);
   if (!$output) {
@@ -168,17 +130,6 @@ function contentanalysis_modal_popup_only() {
   exit;
 }
 
-/**
- * Presents analyzer admin form
- * @see contentanalysis_page_analyzer_form()
- */
-function contentanalysis_page_analyzer() {
-  drupal_add_css(drupal_get_path('module', 'contentanalysis') . '/contentanalysis.admin.css');
-
-  $output = render(drupal_get_form('contentanalysis_page_analyzer_form', array()));
-
-  return $output;
-}
 
 /**
  * Provides content analysis admin form
@@ -195,7 +146,7 @@ function contentanalysis_page_analyzer() {
  * @return
  *   form_api formated array
  */
-function contentanalysis_page_analyzer_form($form_state, $analysis) {
+function contentanalysis_page_analyzer_form($form_state, $analysis = array()) {
   $form['instructions'] = array(
     '#markup' => 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.'),
   );
@@ -557,22 +508,22 @@ function contentanalysis_save_status($analysis) {
   if (!$aid) {
     return;
   }
-  foreach ($analysis AS $anid => $analysisi) {
-    if (substr($anid, 0, 1) == '#' || !is_array($analysisi)) {
+  foreach ($analysis AS $anid => $analysis_item) {
+    if (substr($anid, 0, 1) == '#' || !is_array($analysis_item)) {
       continue;
     }
-    if ((isset($analysisi['#status']) && ($analysisi['#status'] != 'status')) || ($analysisi['#score'])) {
-      $statusi = array(
+    if ((isset($analysis_item['#status']) && ($analysis_item['#status'] != 'status')) || ($analysis_item['#score'])) {
+      $status = array(
         'error' => 0,
         'warning' => 1,
         'complete' => 2,
       );
       $fields = array(
-        'status' => $analysisi['#status'],
-        'statusi' => $statusi[$analysisi['#status']],
+        'status' => $analysis_item['#status'],
+        'statusi' => $status[$analysis_item['#status']],
       );
-      if ($analysisi['#score']) {
-        $fields['score'] = $analysisi['#score'];
+      if ($analysis_item['#score']) {
+        $fields['score'] = $analysis_item['#score'];
       }
       $keys = array(
         'aid' => $aid,