diff --git a/ChangeLog.md b/ChangeLog.md
index f2a04852..cd710252 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -5,6 +5,7 @@
   * Add standard internal class sizes to shipyard page
   * Fix issue when importing Viper Mk IV
   * Ensure ordering of all types of modules (standard, internal, utilities) is consistent
+  * Add rebuilds per bay information for fighter hangars
 
 #2.2.5
   * Calculate rate of fire for multi-burst weapons
diff --git a/src/app/components/AvailableModulesMenu.jsx b/src/app/components/AvailableModulesMenu.jsx
index 4b5013fb..fa4c18d5 100644
--- a/src/app/components/AvailableModulesMenu.jsx
+++ b/src/app/components/AvailableModulesMenu.jsx
@@ -203,6 +203,12 @@ export default class AvailableModulesMenu extends TranslatedComponent {
     this.context.tooltip();
   }
 
+  /**
+   * Order two modules suitably for display in module selection
+   * @param  {Object} a the first module
+   * @param  {Object} b the second module
+   * @return {int}      -1 if the first module should go first, 1 if the second module should go first
+   */
   _moduleOrder(a, b) {
     // Named modules go last
     if (!a.name && b.name) {
diff --git a/src/app/components/InternalSlot.jsx b/src/app/components/InternalSlot.jsx
index 2f8fb206..369d001f 100644
--- a/src/app/components/InternalSlot.jsx
+++ b/src/app/components/InternalSlot.jsx
@@ -43,6 +43,7 @@ export default class InternalSlot extends Slot {
           { m.getMaxMass() ? <div className={'l'}>{translate('max mass')}: {formats.int(m.getMaxMass())}{u.T}</div> : null }
           { m.bins ? <div className={'l'}>{m.bins} <u>{translate('bins')}</u></div> : null }
           { m.bays ? <div className={'l'}>{translate('bays')}: {m.bays}</div> : null }
+          { m.rebuildsperbay ? <div className={'l'}>{translate('rebuildsperbay')}: {m.rebuildsperbay}</div> : null }
           { m.rate ? <div className={'l'}>{translate('rate')}: {m.rate}{u.kgs}&nbsp;&nbsp;&nbsp;{translate('refuel time')}: {formats.time(this.props.fuel * 1000 / m.rate)}</div> : null }
           { m.getAmmo() ? <div className={'l'}>{translate('ammunition')}: {formats.gen(m.getAmmo())}</div> : null }
           { m.cells ? <div className={'l'}>{translate('cells')}: {m.cells}</div> : null }
diff --git a/src/app/i18n/en.js b/src/app/i18n/en.js
index 383e0f1e..808f4e12 100644
--- a/src/app/i18n/en.js
+++ b/src/app/i18n/en.js
@@ -94,6 +94,8 @@ export const terms = {
   // Unit for seconds
   secs: 's',
 
+  rebuildsperbay: 'Rebuilds per bay',
+
   // Weapon, offence, defence and movement
   dpe: 'Damage per MJ of energy',
   dps: 'Damage per second',
@@ -120,6 +122,7 @@ export const terms = {
   boot: 'Boot time',
   brokenregen: 'Broken regeneration rate',
   burst: 'Burst',
+  burstrof: 'Burst rate of fire',
   clip: 'Ammunition clip',
   damage: 'Damage',
   distdraw: 'Distributor draw',
diff --git a/src/app/shipyard/Calculations.js b/src/app/shipyard/Calculations.js
index 44cccab0..600b6bab 100644
--- a/src/app/shipyard/Calculations.js
+++ b/src/app/shipyard/Calculations.js
@@ -172,11 +172,4 @@ function normValues(minMass, optMass, maxMass, minMul, optMul, maxMul, mass, bas
 	  res * (1 - (engpip * 2)),
 	  res * (1 - (engpip * 1)),
 	  res];
-  //return {
-  //  '0 Pips': res * (1 - (engpip * 4)),
-  //  '1 Pip':  res * (1 - (engpip * 3)),
-  //  '2 Pips': res * (1 - (engpip * 2)),
-  //  '3 Pips': res * (1 - (engpip)),
-  //  '4 Pips': res
-  //};
 }