diff --git aat_legacy/aat_legacy.install aat_legacy/aat_legacy.install
index 3506470..90484fa 100644
--- aat_legacy/aat_legacy.install
+++ aat_legacy/aat_legacy.install
@@ -7,10 +7,14 @@ function aat_legacy_install() {
     $select  = "SELECT a.nid, a.asin FROM {amazonnode} a ";
     $select .= "WHERE a.ntype IN ('amazon', 'amazon_node')";
 
-    $insert = "INSERT INTO {amazon_item_node} (nid, vid, asin, module) VALUES (%d, %d, '%s', '%s')";
     $results = db_query($select);
+
+    $insert = "INSERT INTO {amazon_item_node} (nid, vid, asin, module) VALUES (%d, %d, '%s', '%s')";
+    $i = 0;
     while ($asin = db_fetch_object($results)) {
-      db_query($insert, $asin['nid'], -1, $asin['asin'], 'aat_legacy');
+      db_query($insert, $asin->nid, -1, $asin->asin, 'aat_legacy');
+      $i++;
     }
+    drupal_set_message(t("Imported %num records from legacy amazon_node table into amazon_item_node table", array('%num' => $i)));
   }
 }
diff --git aat_legacy/aat_legacy.module aat_legacy/aat_legacy.module
index 1b177ce..9e17200 100644
--- aat_legacy/aat_legacy.module
+++ aat_legacy/aat_legacy.module
@@ -1,7 +1,7 @@
 <?php
 // $Id$
 
-function amazon_node_info() {
+function aat_legacy_node_info() {
   return array(
     'amazon' => array(
       'name' => t('Amazon review'),
@@ -17,11 +17,12 @@ function amazon_node_info() {
       'locked' => TRUE,
     )
   );
+
 }
 
 function aat_legacy_load($node) {
   $asins = array();
-  $sql = "SELECT * FROM {amazon_item_node} ain WHERE ain.nid = %d ORDER BY delta ASC WHERE ain.module = 'aat_legacy'";
+  $sql = "SELECT * FROM {amazon_item_node} ain WHERE ain.nid = %d AND ain.module = 'aat_legacy'";
   $results = db_query($sql, $node->nid);
   while ($asin = db_fetch_array($results)) {
     $asins[$asin['asin']] = $asin;
@@ -34,9 +35,10 @@ function aat_legacy_view(&$node, $teaser = FALSE, $page = FALSE) {
   foreach ($asins as $asin) {
     $node->content['aat_legacy_items'][] = array(
       '#type' => 'markup',
-      '#value' => theme('amazon_item', theme('amazon_item', $product))
+      '#value' => theme('amazon_item', $asin)
     );
   }
+  return $node;
 }
 
 function aat_legacy_delete(&$node) {
diff --git amazon.install amazon.install
index 9e6d18a..d0f4592 100644
--- amazon.install
+++ amazon.install
@@ -118,7 +118,7 @@ function amazon_schema() {
       'module' => array('type' => 'varchar', 'length' => 64, 'not null' => TRUE, 'default' => 'amazon'),
       'delta' => array('type' => 'int', 'default' => 0),
     ),
-    'primary key' => array('vid', 'asin', 'module'),
+    'primary key' => array('nid', 'asin', 'module'),
     'indexes' => array(
       'nid' => array('nid'),
       'vid' => array('vid'),
@@ -139,8 +139,6 @@ function amazon_update_6001() {
 function amazon_update_6002() {
   $ret = array();
   // Make sure that primary keys are correct
-  db_drop_primary_key($ret, 'amazon_item_node');
-  db_add_primary_key($ret, 'amazon_item_node', array('vid', 'asin', 'module'));
   db_drop_primary_key($ret, 'amazon_item_image');
   db_add_primary_key($ret, 'amazon_item_image', array('asin', 'size'));
   return $ret;
@@ -219,4 +217,19 @@ function amazon_update_6008() {
   db_change_field($ret, 'amazon_item', 'listpriceamount', 'listpriceamount',
     array('type' => 'numeric'));
   return $ret;
+}
+
+/**
+ * Change key on amazon_item_node (again).
+ *
+ * It looks like nid should be the correct portion of the key, since there
+ * is no vid coming in. In fact... There should be no vid.
+ *
+ * @return unknown_type
+ */
+function amazon_update_6009() {
+  $ret = array();
+  db_drop_primary_key($ret, 'amazon_item_node');
+  db_add_primary_key($ret, 'amazon_item_node', array('nid', 'asin', 'module'));
+  return $ret;
 }
\ No newline at end of file
diff --git amazon.module amazon.module
index ea322cb..68eddb3 100644
--- amazon.module
+++ amazon.module
@@ -111,7 +111,7 @@ function amazon_preprocess_amazon_item(&$variables) {
 
   $variables['type'] = _amazon_clean_type($item['producttypename']);
   $variables['detailpageurl'] = check_url($item['detailpageurl']);
-  $variables['editorialreview'] = isset($item['editorialreviews']) ? check_markup($item['editorialreviews'][0]['content']) : '';
+  $variables['editorialreview'] = !empty($item['editorialreviews']) ? check_markup($item['editorialreviews'][0]['content']) : '';
   $variables['invalid_asin'] = !empty($item['invalid_asin']) ? 1 : 0;
 
   if (!empty($variables['theatricalreleasedate'])) {