diff --git a/coriolis-data b/coriolis-data
index 648cd56e..1930ea90 160000
--- a/coriolis-data
+++ b/coriolis-data
@@ -1 +1 @@
-Subproject commit 648cd56e5e6833bde2da49f6bc259c578d6a37e9
+Subproject commit 1930ea90cc8518b8f8374fce69ba95a3a68ef1aa
diff --git a/coriolis.py b/coriolis.py
index 814a991b..7cc340ba 100755
--- a/coriolis.py
+++ b/coriolis.py
@@ -279,6 +279,7 @@ if __name__ == "__main__":
         # Internal
         'fs'  : 'Fuel Scoop',
         'sc'  : 'Scanner',
+        'ss'  : 'Detailed Surface Scanner',
         'am'  : 'Auto Field-Maintenance Unit',
         'bsg' : 'Bi-Weave Shield Generator',
         'cr'  : 'Cargo Rack',
@@ -362,8 +363,5 @@ if __name__ == "__main__":
                 else:
                     modules[key] = { 'mass': m.get('mass', 0) }	# Some modules don't have mass
 
-    # not in coriolis-data at time of writing
-    modules[('Pulse Laser', None, '2', 'E')] = { 'mass': 4 }	# Fixed used to be 2F
-
     modules = OrderedDict([(k,modules[k]) for k in sorted(modules)])	# sort for easier diffing
     cPickle.dump(modules, open('modules.p', 'wb'))
diff --git a/modules.p b/modules.p
index ef7489dc..504b76df 100644
Binary files a/modules.p and b/modules.p differ
diff --git a/ships.p b/ships.p
index d4f90a79..dcdfbf66 100644
--- a/ships.p
+++ b/ships.p
@@ -1,5 +1,193 @@
-€}q
(UFederal Assault Shipq}qUhullMassqMā
sU
-Viper MkIVq}qhKūsUFederal Gunshipq}qhMDsUViper MkIIIq	}q
-hK2sUImperial Eagleq}qhK2sUImperial Cutterq
}qhMLsUEagleq}qhK2sUPythonq}qhM^
sUType-6 Transporterq}qhK›sUFer-de-Lanceq}qhKúsUVultureq}qhKæsUAdderq}qhK#sUBeluga Linerq}qhMLsUType-7 Transporterq}qhMĪ
sUFederal Corvetteq}q hM„sUDiamondback Scoutq!}q"hKŠsUAsp Explorerq#}q$hM
sUDiamondback Explorerq%}q&hM*
sUFederal Dropshipq'}q(hMDsUCobra MkIIIq)}q*hKīsUOrcaq+}q,hMDsU
-Sidewinderq-}q.hKsUHaulerq/}q0hKsUType-9 Heavyq1}q2hMčsU
-Cobra MkIVq3}q4hKŌsUImperial Courierq5}q6hK#sUAnacondaq7}q8hM
sUImperial Clipperq9}q:hM
sUKeelbackq;}q<hKīsU	Asp Scoutq=}q>hK–su.
\ No newline at end of file
+ccollections
+OrderedDict
+p1
+((lp2
+(lp3
+S'Adder'
+p4
+a(dp5
+S'hullMass'
+p6
+I35
+saa(lp7
+S'Anaconda'
+p8
+a(dp9
+g6
+I400
+saa(lp10
+S'Asp Explorer'
+p11
+a(dp12
+g6
+I280
+saa(lp13
+S'Asp Scout'
+p14
+a(dp15
+g6
+I150
+saa(lp16
+S'Beluga Liner'
+p17
+a(dp18
+g6
+I950
+saa(lp19
+S'Cobra MkIII'
+p20
+a(dp21
+g6
+I180
+saa(lp22
+S'Cobra MkIV'
+p23
+a(dp24
+g6
+I210
+saa(lp25
+S'Diamondback Explorer'
+p26
+a(dp27
+g6
+I260
+saa(lp28
+S'Diamondback Scout'
+p29
+a(dp30
+g6
+I170
+saa(lp31
+S'Dolphin'
+p32
+a(dp33
+g6
+I140
+saa(lp34
+S'Eagle'
+p35
+a(dp36
+g6
+I50
+saa(lp37
+S'Federal Assault Ship'
+p38
+a(dp39
+g6
+I480
+saa(lp40
+S'Federal Corvette'
+p41
+a(dp42
+g6
+I900
+saa(lp43
+S'Federal Dropship'
+p44
+a(dp45
+g6
+I580
+saa(lp46
+S'Federal Gunship'
+p47
+a(dp48
+g6
+I580
+saa(lp49
+S'Fer-de-Lance'
+p50
+a(dp51
+g6
+I250
+saa(lp52
+S'Hauler'
+p53
+a(dp54
+g6
+I14
+saa(lp55
+S'Imperial Clipper'
+p56
+a(dp57
+g6
+I400
+saa(lp58
+S'Imperial Courier'
+p59
+a(dp60
+g6
+I35
+saa(lp61
+S'Imperial Cutter'
+p62
+a(dp63
+g6
+I1100
+saa(lp64
+S'Imperial Eagle'
+p65
+a(dp66
+g6
+I50
+saa(lp67
+S'Keelback'
+p68
+a(dp69
+g6
+I180
+saa(lp70
+S'Orca'
+p71
+a(dp72
+g6
+I290
+saa(lp73
+S'Python'
+p74
+a(dp75
+g6
+I350
+saa(lp76
+S'Sidewinder'
+p77
+a(dp78
+g6
+I25
+saa(lp79
+S'Type-6 Transporter'
+p80
+a(dp81
+g6
+I155
+saa(lp82
+S'Type-7 Transporter'
+p83
+a(dp84
+g6
+I420
+saa(lp85
+S'Type-9 Heavy'
+p86
+a(dp87
+g6
+I1000
+saa(lp88
+S'Viper MkIII'
+p89
+a(dp90
+g6
+I50
+saa(lp91
+S'Viper MkIV'
+p92
+a(dp93
+g6
+I190
+saa(lp94
+S'Vulture'
+p95
+a(dp96
+g6
+I230
+saatRp97
+.
\ No newline at end of file