diff --git a/graphs/data/fitMobility/getter.py b/graphs/data/fitMobility/getter.py
index 9e96ae36c..49552abc9 100644
--- a/graphs/data/fitMobility/getter.py
+++ b/graphs/data/fitMobility/getter.py
@@ -76,13 +76,14 @@ class Time2MomentumGetter(Time2SpeedGetter):
 class Time2BumpSpeedGetter(Time2SpeedGetter):
 
     def _calculatePoint(self, x, miscParams, src, tgt, commonData):
-        bumperMass = commonData['mass']
+        # S. Santorine, Ship Motion in EVE-Online, p3, Collisions & Bumping section
+        # https://docs.google.com/document/d/1rwVWjTvzVdPEFETf0vwm649AFb4bgRBaNLpRPaoB03o
+        # Internally, Santorine's formulas are using millions of kilograms, so we normalize to them here
+        bumperMass = commonData['mass'] / 10 ** 6
         bumperSpeed = Time2SpeedGetter._calculatePoint(
             self, x=x, miscParams=miscParams,
             src=src, tgt=tgt, commonData=commonData)
-        tgtMass = miscParams['tgtMass']
-        # S. Santorine, Ship Motion in EVE-Online, p3, Collisions & Bumping section
-        # https://docs.google.com/document/d/1rwVWjTvzVdPEFETf0vwm649AFb4bgRBaNLpRPaoB03o
+        tgtMass = miscParams['tgtMass'] / 10 ** 6
         tgtSpeed = (2 * bumperSpeed * bumperMass) / (bumperMass + tgtMass)
         return tgtSpeed
 
@@ -90,12 +91,13 @@ class Time2BumpSpeedGetter(Time2SpeedGetter):
 class Time2BumpDistanceGetter(Time2BumpSpeedGetter):
 
     def _calculatePoint(self, x, miscParams, src, tgt, commonData):
-        tgtMass = miscParams['tgtMass']
+        # S. Santorine, Ship Motion in EVE-Online, p3, Collisions & Bumping section
+        # https://docs.google.com/document/d/1rwVWjTvzVdPEFETf0vwm649AFb4bgRBaNLpRPaoB03o
+        # Internally, Santorine's formulas are using millions of kilograms, so we normalize to them here
+        tgtMass = miscParams['tgtMass'] / 10 ** 6
         tgtInertia = miscParams['tgtInertia']
         tgtSpeed = Time2BumpSpeedGetter._calculatePoint(
             self, x=x, miscParams=miscParams,
             src=src, tgt=tgt, commonData=commonData)
-        # S. Santorine, Ship Motion in EVE-Online, p3, Collisions & Bumping section
-        # https://docs.google.com/document/d/1rwVWjTvzVdPEFETf0vwm649AFb4bgRBaNLpRPaoB03o
         tgtDistance = tgtSpeed * tgtMass * tgtInertia
         return tgtDistance
diff --git a/graphs/data/fitMobility/graph.py b/graphs/data/fitMobility/graph.py
index 95912e587..90e4b5d94 100644
--- a/graphs/data/fitMobility/graph.py
+++ b/graphs/data/fitMobility/graph.py
@@ -31,18 +31,18 @@ class FitMobilityGraph(FitGraph):
     yDefs = [
         YDef(handle='speed', unit='m/s', label='Speed'),
         YDef(handle='distance', unit='km', label='Distance'),
-        YDef(handle='momentum', unit='Mt⋅m/s', label='Momentum'),
-        YDef(handle='bumpSpeed', unit='m/s', label='Bump speed', hidden=True),
-        YDef(handle='bumpDistance', unit='km', label='Bump distance', hidden=True)]
+        YDef(handle='momentum', unit='Gkg⋅m/s', label='Momentum'),
+        YDef(handle='bumpSpeed', unit='m/s', label='Bump speed'),
+        YDef(handle='bumpDistance', unit='km', label='Bump distance')]
     inputs = [
         Input(handle='time', unit='s', label='Time', iconID=1392, defaultValue=10, defaultRange=(0, 30)),
         # Default values in target fields correspond to a random carrier/fax
-        Input(handle='tgtMass', unit='kt', label='Target mass', iconID=76, defaultValue=1300, defaultRange=(100, 2500), conditions=[(None, ('bumpSpeed', 'm/s')), (None, ('bumpDistance', 'km'))], secondaryTooltip='Defined in kilotons, or millions of kilograms'),
+        Input(handle='tgtMass', unit='Mkg', label='Target mass', iconID=76, defaultValue=1300, defaultRange=(100, 2500), conditions=[(None, ('bumpSpeed', 'm/s')), (None, ('bumpDistance', 'km'))], secondaryTooltip='Defined in millions of kilograms'),
         Input(handle='tgtInertia', unit=None, label='Target inertia factor', iconID=1401, defaultValue=0.015, defaultRange=(0.03, 0.1), conditions=[(None, ('bumpDistance', 'km'))], secondaryTooltip='Inertia Modifier attribute value of the target ship')]
     srcExtraCols = ('Speed', 'Agility')
 
     # Calculation stuff
-    _normalizers = {('tgtMass', 'kt'): lambda v, src, tgt: None if v is None else v * 10 ** 6}
+    _normalizers = {('tgtMass', 'Mkg'): lambda v, src, tgt: None if v is None else v * 10 ** 6}
     _getters = {
         ('time', 'speed'): Time2SpeedGetter,
         ('time', 'distance'): Time2DistanceGetter,
@@ -51,5 +51,5 @@ class FitMobilityGraph(FitGraph):
         ('time', 'bumpDistance'): Time2BumpDistanceGetter}
     _denormalizers = {
         ('distance', 'km'): lambda v, src, tgt: v / 1000,
-        ('momentum', 'Mt⋅m/s'): lambda v, src, tgt: v / 10 ** 9,
+        ('momentum', 'Gkg⋅m/s'): lambda v, src, tgt: v / 10 ** 9,
         ('bumpDistance', 'km'): lambda v, src, tgt: v / 1000}