diff --git a/app/views/_slot-hardpoint.html b/app/views/_slot-hardpoint.html
index ad593079..4a5e53a3 100755
--- a/app/views/_slot-hardpoint.html
+++ b/app/views/_slot-hardpoint.html
@@ -4,9 +4,8 @@
   <div class="l">{{hp.c.class}}{{hp.c.rating}}<span ng-if="hp.c.mode">/{{hp.c.mode}}{{hp.c.missile}}</span> {{hp.c.name || lbl}}</div>
   <div class="r">{{hp.c.mass}} <u>T</u></div>
   <div class="cb">
-    <div class="l" ng-if="hp.c.damage">DMG: {{hp.c.damage}} <span ng-if="hp.c.ssdam">({{$r.fCrd(hp.c.ssdam)}} <u>MJ</u>)</span></div>
-    <div class="l" ng-if="hp.c.dps">DPS: {{hp.c.dps}} <span ng-if="hp.c.mjdps">({{$r.fCrd(hp.c.mjdps)}} <u>MJ</u>)</span></div>
-    <div class="l" ng-if="hp.c.mjeps">EPS: {{$r.fCrd(hp.c.mjeps)}} <u>MJ</u></div>
+    <div class="l" ng-if="hp.c.damage">Damage: {{hp.c.damage}} <span ng-if="hp.c.ssdam">({{$r.fCrd(hp.c.ssdam)}} <u>Mj</u>)</span></div>
+    <div class="l" ng-if="hp.c.dps">DPS: {{hp.c.dps}} <span ng-if="hp.c.mjdps">({{$r.fCrd(hp.c.mjdps)}} <u>Mj</u>)</span></div>
     <div class="l" ng-if="hp.c.thermload">T-Load: {{hp.c.thermload}}</div>
     <div class="l" ng-if="hp.c.type">Type: {{hp.c.type}}</div>
     <div class="l" ng-if="hp.c.rof">ROF: {{hp.c.rof}}<u>/s</u></div>
diff --git a/app/views/_slot-internal.html b/app/views/_slot-internal.html
index c3f499d4..b8d09fb0 100755
--- a/app/views/_slot-internal.html
+++ b/app/views/_slot-internal.html
@@ -7,11 +7,14 @@
   <div class="l" ng-if="c.c.optmass">Opt: {{c.c.optmass}} <u>T</u></div>
   <div class="l" ng-if="c.c.maxmass">Max: {{c.c.maxmass}} <u>T</u></div>
   <div class="l" ng-if="c.c.bins">{{c.c.bins}} <u>Bins</u></div>
-  <div class="l" ng-if="c.c.rate">Rate: {{c.c.rate}} <u>Kg/s</u>&nbsp;&nbsp;&nbsp;Refuel Time: {{$r.fTime(ft.c.capacity * 1000 / c.c.rate)}}</div>
+  <div class="l" ng-if="c.c.rate">Rate: {{c.c.rate}} <u>Kg/s</u>&nbsp;&nbsp;&nbsp;Refuel Time: {{$r.fTime(fuel * 1000 / c.c.rate)}}</div>
   <div class="l" ng-if="c.c.ammo">Ammo: {{c.c.ammo}}</div>
   <div class="l" ng-if="c.c.cells">Cells: {{c.c.cells}}</div>
   <div class="l" ng-if="c.c.recharge">Recharge: {{c.c.recharge}} <u>Mj</u></div>
   <div class="l" ng-if="c.c.repair">Repair: {{c.c.repair}}</div>
+  <div class="l" ng-if="c.c.range">Range {{c.c.range}} <u>Km</u></div>
+  <div class="l" ng-if="c.c.time">Time: {{$r.fTime(c.c.time)}}</div>
+  <div class="l" ng-if="c.c.maximum">Max: {{(c.c.maximum)}}</div>
   <div class="l" ng-if="c.c.rangeLS">{{c.c.rangeLS}} <u>LS</u></div>
   <div class="l" ng-if="c.c.rangeLS === null"><svg class="icon"><use xlink:href="#infinite"></use></svg> <u>LS</u></div>
   <div class="l" ng-if="c.c.rangeRating">Range: {{c.c.rangeRating}}</div>