diff --git a/app/js/controllers/controller-outfit.js b/app/js/controllers/controller-outfit.js
index 74d42d16..edc1d071 100755
--- a/app/js/controllers/controller-outfit.js
+++ b/app/js/controllers/controller-outfit.js
@@ -461,6 +461,7 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
 
   $scope.fuelChange = function(fuel) {
     $scope.fuel = fuel;
+    updateAmmoCosts();
     win.triggerHandler('render');
   };
 
@@ -555,20 +556,17 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
 
   function updateAmmoCosts() {
     var costs = $scope.ammoList = [];
-    var controllers = [];
-    var total = 0, i, l, item, q;
+    var total = 0, i, l, item, q, limpets = 0, scoop = false;
 
     for (var g in { common: 1, internal: 1, hardpoints: 1 }) {
       var slotGroup = ship[g];
       for (i = 0, l = slotGroup.length; i < l; i++) {
         if (slotGroup[i].id) {
-          //special cases needed for fuel, SCB, AFMU, and limpet controllers since they don't use standard ammo/clip
-          var isLimpet = false;
+          //special cases needed for SCB, AFMU, and limpet controllers since they don't use standard ammo/clip
           q = 0;
           switch (slotGroup[i].c.grp) {
-            case 'ft':
-              q = slotGroup[i].c.capacity;
-              slotGroup[i].c.ammocost = 50;
+            case 'fs': //skip fuel calculation if scoop present
+              scoop = true;
               break;
             case 'scb':
               q = slotGroup[i].c.cells;
@@ -577,12 +575,7 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
               q = slotGroup[i].c.ammo;
               break;
             case 'fx': case 'hb': case 'cc': case 'pc':
-              isLimpet = true;
-              if (!ship.cargoCapacity) { //skip ammo costs if no cargo space for limpets
-                continue;
-              }
-              q = ship.cargoCapacity;
-              slotGroup[i].c.ammocost = 101;
+              limpets = ship.cargoCapacity;
               break;
             default:
               q = slotGroup[i].c.clip + slotGroup[i].c.ammo;
@@ -596,22 +589,35 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
               ammoUnitCost: slotGroup[i].c.ammocost,
               ammoTotalCost: q * slotGroup[i].c.ammocost
             };
-            if (isLimpet) { //add total limpet cost once and finalize costs entry later
-              controllers.push(item);
-              total += controllers.length == 1 ? item.ammoTotalCost : 0;
-            } else {
-              costs.push(item);
-              total += item.ammoTotalCost;
-            }
+            costs.push(item);
+            total += item.ammoTotalCost;
           }
         }
       }
     }
-    q = Math.ceil(ship.cargoCapacity / controllers.length);
-    for (i = 0; i < controllers.length; i++) {
-      controllers[i].ammoTotalCost = q * 101;
-      controllers[i].ammoMax = (i == 0) && (q != ship.cargoCapacity / controllers.length) ? q-- : q; // handle rounding error with first controller
-      costs.push(controllers[i]);
+
+    //limpets if controllers exist and cargo space available
+    if (limpets > 0) {
+      item = {
+        ammoName: 'limpets',
+        ammoMax: ship.cargoCapacity,
+        ammoUnitCost: 101,
+        ammoTotalCost: ship.cargoCapacity * 101
+      };
+      costs.push(item);
+      total += item.ammoTotalCost;
+    }
+    //total fuel, or if slider isn't at max, use that value and only if scoop not present
+    if (!scoop) {
+      q = $scope.fuel != ship.fuelCapacity ? $scope.fuel : ship.fuelCapacity;
+      item = {
+        ammoName: 'fuel',
+        ammoMax: q,
+        ammoUnitCost: 50,
+        ammoTotalCost: q * 50
+      };
+      costs.push(item);
+      total += item.ammoTotalCost;
     }
     $scope.ammoTotal = total;
   }
diff --git a/app/js/i18n/de.js b/app/js/i18n/de.js
index c5db8091..4acc3b46 100644
--- a/app/js/i18n/de.js
+++ b/app/js/i18n/de.js
@@ -115,6 +115,7 @@ angular.module('app').config(['$translateProvider', 'localeFormatProvider', func
     laden: 'Beladen',
     language: 'Sprache',
     large: 'Groß',
+    limpets: 'Krallen',
     ls: 'Lebenserhaltung',
     'Lightweight Alloy': 'Leichte Legierung',
     'lock factor': 'Massensperrefaktor',
diff --git a/app/js/i18n/en.js b/app/js/i18n/en.js
index c2818eb7..ac01137d 100644
--- a/app/js/i18n/en.js
+++ b/app/js/i18n/en.js
@@ -105,6 +105,7 @@ angular.module('app').config(['$translateProvider', function($translateProvider)
     laden: 'laden',
     language: 'language',
     large: 'large',
+    'limpets': 'Limpets',
     ls: 'life support',
     'Lightweight Alloy': 'Lightweight Alloy',
     'lock factor': 'lock factor',
diff --git a/app/js/i18n/es.js b/app/js/i18n/es.js
index ee174fbc..ccc5bbac 100644
--- a/app/js/i18n/es.js
+++ b/app/js/i18n/es.js
@@ -115,6 +115,7 @@ angular.module('app').config(['$translateProvider', 'localeFormatProvider', func
     'large': 'Grande',
     'ls': 'Soporte vital',
     'Lightweight Alloy': 'Aleaci\u00f3n ligera',
+    'limpets': 'Drones',
     'lock factor': 'factor de bloqueo',
     'mass': 'Masa',
     'max': 'm\u00e1x',
diff --git a/app/js/i18n/fr.js b/app/js/i18n/fr.js
index 80d18db7..69449222 100644
--- a/app/js/i18n/fr.js
+++ b/app/js/i18n/fr.js
@@ -106,6 +106,7 @@ angular.module('app').config(['$translateProvider', 'localeFormatProvider', func
     large: 'large',
     ls: 'Systèmes de survie',
     'Lightweight Alloy': 'alliage léger',
+    'limpets': 'Patelles',
     'lock factor': 'facteur inhibition de masse',
     LS: 'SL',
     LY: 'AL',
diff --git a/app/js/i18n/ru.js b/app/js/i18n/ru.js
index 07c5002d..e6b61363 100644
--- a/app/js/i18n/ru.js
+++ b/app/js/i18n/ru.js
@@ -124,6 +124,7 @@ angular.module('app').config(['$translateProvider', 'localeFormatProvider', func
     large: 'большой',
     ls: 'Система жизнеобеспечения',
     'Lightweight Alloy': 'Легкий сплав',
+    'limpets': 'Дроны',
     'lock factor': 'Масс. блок',
     LS: 'Св.сек',
     LY: 'Св.лет',