diff --git a/js/uc_affirm.js b/js/uc_affirm.js
index 0a3d81b..414e97d 100644
--- a/js/uc_affirm.js
+++ b/js/uc_affirm.js
@@ -6,7 +6,6 @@
 (function ($) {
   Drupal.behaviors.uc_affirm_checkout = {
     attach: function (context) {
-      console.log(drupalSettings.uc_affirm);
       var settings = drupalSettings.uc_affirm;
       var url = (settings.ApiMode == 'live')
           ? 'https://cdn1.affirm.com/js/v2/affirm.js'
diff --git a/src/Plugin/Ubercart/PaymentMethod/Affirm.php b/src/Plugin/Ubercart/PaymentMethod/Affirm.php
index a36b2b0..0cc7847 100644
--- a/src/Plugin/Ubercart/PaymentMethod/Affirm.php
+++ b/src/Plugin/Ubercart/PaymentMethod/Affirm.php
@@ -36,7 +36,7 @@ class Affirm extends PaymentMethodPluginBase {
     );
     $build['image'] = array(
       '#theme' => 'image',
-      '#uri' => drupal_get_path('module', 'uc_affirm') . '/images/affirm_logo.png',
+      '#uri' => drupal_get_path('module', 'uc_affirm') . '/images/affirm-icon.png',
       '#alt' => $this->t('Affirm'),
       '#attributes' => array('class' => array('')),
     );
@@ -118,11 +118,19 @@ class Affirm extends PaymentMethodPluginBase {
    * {@inheritdoc}
    */
   public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
+    $config = \Drupal::service('config.factory')->getEditable('uc_affirm.settings');
     $this->configuration['uc_affirm_fpkey'] = $form_state->getValue('uc_affirm_fpkey');
     $this->configuration['uc_affirm_public_key'] = $form_state->getValue('uc_affirm_public_key');
     $this->configuration['uc_affirm_private_key'] = $form_state->getValue('uc_affirm_private_key');
     $this->configuration['uc_affirm_server'] = $form_state->getValue('uc_affirm_server');
     $this->configuration['uc_affirm_txt_type'] = $form_state->getValue('uc_affirm_txt_type');
+    $values = $form_state->getValues();
+    $config -> set('uc_affirm_fpkey', $values['settings']['uc_affirm_fpkey'])
+      ->set('uc_affirm_public_key', $values['settings']['uc_affirm_public_key'])
+      ->set('uc_affirm_private_key', $values['settings']['uc_affirm_private_key'])
+      ->set('uc_affirm_server', $values['settings']['uc_affirm_server'])
+      ->set('uc_affirm_txt_type', $values['settings']['uc_affirm_txt_type'])
+      ->save();
   }
 
 }
diff --git a/uc_affirm.module b/uc_affirm.module
index cc6c847..3d054c5 100644
--- a/uc_affirm.module
+++ b/uc_affirm.module
@@ -99,7 +99,7 @@ function _uc_affirm_cart_review_data($order) {
   // General settings.
     'ApiMode' => empty($config->get('uc_affirm_server')) ? 'sandbox' : $config->get('uc_affirm_server'),
     'PublicKey' => empty($config->get('uc_affirm_public_key')) ? '' : $config->get('uc_affirm_public_key'),
-    'FinancialProductKey' => empty($config->get('uc_affirm_public_key')) ? '' : $config->get('uc_affirm_public_key'),
+    'FinancialProductKey' => empty($config->get('uc_affirm_fpkey')) ? '' : $config->get('uc_affirm_fpkey'),
     'OrderId' => $order->id(),
     'Email' => Unicode::substr($order->getEmail(), 0, 64),
     'CancelUrl' => Url::fromRoute('uc_cart.checkout_review', [], ['absolute' => TRUE])->toString(),
@@ -133,7 +133,7 @@ function _uc_affirm_cart_review_data($order) {
   // Adds information about the Shipping profile.
   $data += array(
     'ShippingFullName' => Unicode::substr($order->getAddress('delivery')->first_name . ' ' . $order->getAddress('delivery')->last_name, 0, 128),
-    'ShippingFirstName' => Unicode::substr($order->getAddress('delivery')->first_name),
+    'ShippingFirstName' => Unicode::substr($order->getAddress('delivery')->first_name, 0, 128),
     'ShippingLastName' => Unicode::substr($order->getAddress('delivery')->last_name, 0, 128),
     'ShippingAddressLn1' => Unicode::substr($order->getAddress('delivery')->street1, 0, 64),
     'ShippingAddressLn2' => Unicode::substr($order->getAddress('delivery')->street2, 0, 64),