diff --git a/fivestar.module b/fivestar.module
index 27787a6..3d6c69f 100644
--- a/fivestar.module
+++ b/fivestar.module
@@ -478,12 +478,13 @@ function theme_fivestar_static($rating, $stars = 5) {
     }
     elseif ($rating >= $star_value) {
       $output .= '<div class="star"><span class="on">' . $n . '</span></div>';
+      $prev_star_value = $star_value;
     }
     else {
       $output .= '<div class="star"><span class="off">' . $n . '</span></div>';
     }
   }
-  $output .= '</div>';
+  $output .= '<div class="stars-end"></div></div>';
   return $output;
 }
 
diff --git a/fivestar_field.inc b/fivestar_field.inc
index 82a1c32..4ebf59e 100644
--- a/fivestar_field.inc
+++ b/fivestar_field.inc
@@ -26,7 +26,7 @@ function fivestar_field_settings($op, $field) {
         '#type' => 'select',
         '#title' => t('Number of Options'),
         '#options' => drupal_map_assoc(array(1,2,3,4,5,6,7,8,9,10)),
-        '#default_value' => $widget['stars'] ? $widget['stars'] : 5,
+        '#default_value' => $field['stars'] ? $field['stars'] : 5,
         '#description' => t('The number of stars or radio buttons to display.'),
       );
       $form['target'] = array(
@@ -78,7 +78,12 @@ function fivestar_field($op, &$node, $field, &$items, $teaser, $page) {
         if ($field['php']) {
           $items[$delta]['target'] = drupal_eval($item['target']);
         }
-        $target_node = node_load($items[$delta]['target']);
+        if ($items[$delta]['target']) {
+          $target_node = node_load($items[$delta]['target']);
+        }
+        else {
+          $target_node =& $node;
+        }
         if ($item['rating'] == 0) {
           votingapi_unset_vote('node', $target_node->nid);
         }
diff --git a/theme/fivestar.css b/theme/fivestar.css
index bc24d51..91e0b9b 100644
--- a/theme/fivestar.css
+++ b/theme/fivestar.css
@@ -16,6 +16,9 @@ div.fivestar-widget-static .star {
   overflow: hidden;
   text-indent: -999em;
 }
+div.fivestar-widget-static .stars-end {
+  clear: left;
+}
 
 div.fivestar-widget-static .star span.on {
   display: block;