diff --git uc_price_per_role.install uc_price_per_role.install
old mode 100644
new mode 100755
index 2e83088..fe03940
--- uc_price_per_role.install
+++ uc_price_per_role.install
@@ -13,6 +13,7 @@ function uc_price_per_role_install() {
  */
 function uc_price_per_role_uninstall() {
   drupal_uninstall_schema('uc_price_per_role');
+  db_query("DELETE FROM {variable} WHERE name LIKE 'uc_price_per_role_%%'");
 }
 
 /**
diff --git uc_price_per_role.module uc_price_per_role.module
old mode 100644
new mode 100755
index 6336115..00ed949
--- uc_price_per_role.module
+++ uc_price_per_role.module
@@ -151,6 +151,11 @@ function uc_price_per_role_form_alter(&$form, &$form_state, $form_id) {
   if ($form['#id'] == 'node-form' && isset($form['base']['prices'])) {
     $enabled = variable_get('uc_price_per_role_enabled', array());
 
+    if (!empty($enabled)) {
+      $form['base']['prices']['sell_price']['#title'] = t('Default sell price');
+      $form['base']['prices']['sell_price']['#description'] = t('Default customer purchase price.');
+    }
+
     $form['base']['role_prices'] = array(
       '#weight' => 6,
       '#theme' => 'uc_price_per_role_product_prices',
@@ -171,9 +176,17 @@ function uc_price_per_role_form_alter(&$form, &$form_state, $form_id) {
         );
       }
     }
+  }
+
 
+  else if ($form_id === 'uc_object_options_form') {
+    $form['uc_price_per_role_note'] = array(
+      '#value' => '<p>'. t('Note: "Price" column is the default option price. To set option prices per role use the <a href="@link">options prices form</a>.', array('@link' => url('node/'. $form['id']['#value'] .'/edit/option_prices'))) .'</p>',
+    );
+  }
 
-  } else if (strpos($form_id, 'add_to_cart_form')) {
+
+  else if (strpos($form_id, 'add_to_cart_form')) {
     // Modify product form attribute option prices.
     $format = variable_get('uc_attribute_option_price_format', 'adjustment');
     if (module_exists('uc_attribute') && $format != 'none') {
@@ -191,18 +204,38 @@ function uc_price_per_role_form_alter(&$form, &$form_state, $form_id) {
         if (isset($form['attributes'][$aid]['#options'])) {
           $attribute = uc_attribute_load($aid, $nid, 'product');
 
+          $context = array(
+            'revision' => 'altered',
+            'type' => 'product',
+            'subject' => array(
+              'node' => $product,
+            ),
+            'field' => 'price',
+          );
+          $product_price = uc_price($product->sell_price, $context);
+
           foreach (array_keys($form['attributes'][$aid]['#options']) as $oid) {
             $price = uc_price_per_role_find_price($role_prices[$oid]);
 
             if ($price !== FALSE) {
+              $context = array(
+                'revision' => 'formatted',
+                'type' => 'attribute_option',
+                'subject' => array(
+                  'attribute' => $attribute,
+                  'option' => $attribute->options[$oid],
+                ),
+                'field' => 'price',
+              );
+
               switch ($format) {
                 case 'total':
-                  $display_price = in_array($aid, $priced_attributes) ? ', '. uc_currency_format(($product->sell_price + $price) * $qty) : '';
+                  $display_price = in_array($aid, $priced_attributes) ? ', '. uc_price(($product_price + $price) * $qty, $context) : '';
                   if (count($priced_attributes) == 1) {
                     break;
                   }
                 case 'adjustment':
-                  $display_price = ($price != 0 ? ', '. ($price > 0 ? '+' : '') . uc_currency_format($price * $qty) : '');
+                  $display_price = ($price != 0 ? ', '. ($price > 0 ? '+' : '') . uc_price($price * $qty, $context) : '');
                   break;
               }
 
@@ -313,7 +346,7 @@ function uc_price_per_role_option_prices_form($form_state, $product) {
   $enabled = array_keys(array_filter(variable_get('uc_price_per_role_enabled', array())));
   
   $form['help'] = array(
-    '#value' => t('Leave any box blank to use the standard price for the option.'),
+    '#value' => t('Leave any box blank to use the default price for the option.'),
   );
 
   foreach (uc_product_get_attributes($product->nid) as $aid => $attribute) {
@@ -331,6 +364,14 @@ function uc_price_per_role_option_prices_form($form_state, $product) {
 
     $form['attributes'][$aid]['options'] = array('#weight' => 2);
 
+    $context = array(
+      'type' => 'attribute_option',
+      'subject' => array(
+        'attribute' => $attribute,
+      ),
+      'field' => 'price',
+    );
+
     $base_attr = uc_attribute_load($attribute->aid);
 
     if ($base_attr->options) {
@@ -341,12 +382,22 @@ function uc_price_per_role_option_prices_form($form_state, $product) {
       while ($option = db_fetch_object($result)) {
         $oid = $option->oid;
 
+        $context['revision'] = 'themed';
+        $context['subject']['option'] = $option;
+        $price = is_null($option->price) ? $option->default_price : $option->price;
+
         $form['attributes'][$aid]['options'][$oid]['name'] = array(
           '#value' => $option->name,
         );
 
         $form['attributes'][$aid]['options'][$oid]['price'] = array(
-          '#value' => uc_currency_format(is_null($option->price) ? $option->default_price : $option->price),
+          '#value' => uc_price($price, $context),
+        );
+        // Include unformatted original price to simplify form alteration.
+        $context['revision'] = 'original';
+        $form['attributes'][$aid]['options'][$oid]['price_value'] = array(
+          '#type' => 'value',
+          '#value' => uc_price($price, $context),
         );
 
         foreach ($enabled as $rid) {
@@ -390,7 +441,7 @@ function theme_uc_price_per_role_option_prices_form($form) {
   $roles = user_roles();
   $enabled = array_keys(array_filter(variable_get('uc_price_per_role_enabled', array())));
 
-  $header = array(t('Attribute'), t('Option'), t('Standard price'));
+  $header = array(t('Attribute'), t('Option'), t('Default price'));
   foreach ($enabled as $rid) {
     $header[] = t('%role price', array('%role' => $roles[$rid]));
   }