diff --git a/companion.py b/companion.py
index 26cb045d..b8a3fac6 100644
--- a/companion.py
+++ b/companion.py
@@ -63,6 +63,8 @@ ship_map = {
     'independant_trader'          : 'Keelback',
     'independent_fighter'         : 'Taipan Fighter',
     'krait_mkii'                  : 'Krait MkII',
+    'krait_light'                 : 'Krait Phantom',
+    'mamba'                       : 'Mamba',
     'orca'                        : 'Orca',
     'python'                      : 'Python',
     'scout'                       : 'Taipan Fighter',
diff --git a/coriolis-data b/coriolis-data
index 48f19712..ee4ffc01 160000
--- a/coriolis-data
+++ b/coriolis-data
@@ -1 +1 @@
-Subproject commit 48f19712170915328d38804ca3470fdf20ff176f
+Subproject commit ee4ffc011600201b791e4bcbff62e162cb9cb958
diff --git a/modules.p b/modules.p
index d06c6e25..d4812a0c 100644
--- a/modules.p
+++ b/modules.p
@@ -5945,442 +5945,484 @@ a(dp2831
 g6
 I320
 saa(lp2832
-S'int_stellarbodydiscoveryscanner_advanced'
+S'krait_light_armour_grade1'
 p2833
 a(dp2834
 g6
-I2
+I0
 saa(lp2835
-S'int_stellarbodydiscoveryscanner_intermediate'
+S'krait_light_armour_grade2'
 p2836
 a(dp2837
 g6
-I2
+I36
 saa(lp2838
-S'int_stellarbodydiscoveryscanner_standard'
+S'krait_light_armour_grade3'
 p2839
 a(dp2840
 g6
-I2
+I67
 saa(lp2841
-S'krait_mkii_armour_grade1'
+S'krait_light_armour_mirrored'
 p2842
 a(dp2843
 g6
-I0
+I67
 saa(lp2844
-S'krait_mkii_armour_grade2'
+S'krait_light_armour_reactive'
 p2845
 a(dp2846
 g6
-I36
+I67
 saa(lp2847
-S'krait_mkii_armour_grade3'
+S'krait_mkii_armour_grade1'
 p2848
 a(dp2849
 g6
-I67
+I0
 saa(lp2850
-S'krait_mkii_armour_mirrored'
+S'krait_mkii_armour_grade2'
 p2851
 a(dp2852
 g6
-I67
+I36
 saa(lp2853
-S'krait_mkii_armour_reactive'
+S'krait_mkii_armour_grade3'
 p2854
 a(dp2855
 g6
 I67
 saa(lp2856
-S'orca_armour_grade1'
+S'krait_mkii_armour_mirrored'
 p2857
 a(dp2858
 g6
-I0
+I67
 saa(lp2859
-S'orca_armour_grade2'
+S'krait_mkii_armour_reactive'
 p2860
 a(dp2861
 g6
-I21
+I67
 saa(lp2862
-S'orca_armour_grade3'
+S'mamba_armour_grade1'
 p2863
 a(dp2864
 g6
-I87
+I0
 saa(lp2865
-S'orca_armour_mirrored'
+S'mamba_armour_grade2'
 p2866
 a(dp2867
 g6
-I87
+I19
 saa(lp2868
-S'orca_armour_reactive'
+S'mamba_armour_grade3'
 p2869
 a(dp2870
 g6
-I87
+I38
 saa(lp2871
-S'python_armour_grade1'
+S'mamba_armour_mirrored'
 p2872
 a(dp2873
 g6
-I0
+I38
 saa(lp2874
-S'python_armour_grade2'
+S'mamba_armour_reactive'
 p2875
 a(dp2876
 g6
-I26
+I38
 saa(lp2877
-S'python_armour_grade3'
+S'orca_armour_grade1'
 p2878
 a(dp2879
 g6
-I53
+I0
 saa(lp2880
-S'python_armour_mirrored'
+S'orca_armour_grade2'
 p2881
 a(dp2882
 g6
-I53
+I21
 saa(lp2883
-S'python_armour_reactive'
+S'orca_armour_grade3'
 p2884
 a(dp2885
 g6
-I53
+I87
 saa(lp2886
-S'sidewinder_armour_grade1'
+S'orca_armour_mirrored'
 p2887
 a(dp2888
 g6
-I0
+I87
 saa(lp2889
-S'sidewinder_armour_grade2'
+S'orca_armour_reactive'
 p2890
 a(dp2891
 g6
-I2
+I87
 saa(lp2892
-S'sidewinder_armour_grade3'
+S'python_armour_grade1'
 p2893
 a(dp2894
 g6
-I4
+I0
 saa(lp2895
-S'sidewinder_armour_mirrored'
+S'python_armour_grade2'
 p2896
 a(dp2897
 g6
-I4
+I26
 saa(lp2898
-S'sidewinder_armour_reactive'
+S'python_armour_grade3'
 p2899
 a(dp2900
 g6
-I4
+I53
 saa(lp2901
-S'type6_armour_grade1'
+S'python_armour_mirrored'
 p2902
 a(dp2903
 g6
-I0
+I53
 saa(lp2904
-S'type6_armour_grade2'
+S'python_armour_reactive'
 p2905
 a(dp2906
 g6
-I12
+I53
 saa(lp2907
-S'type6_armour_grade3'
+S'sidewinder_armour_grade1'
 p2908
 a(dp2909
 g6
-I23
+I0
 saa(lp2910
-S'type6_armour_mirrored'
+S'sidewinder_armour_grade2'
 p2911
 a(dp2912
 g6
-I23
+I2
 saa(lp2913
-S'type6_armour_reactive'
+S'sidewinder_armour_grade3'
 p2914
 a(dp2915
 g6
-I23
+I4
 saa(lp2916
-S'type7_armour_grade1'
+S'sidewinder_armour_mirrored'
 p2917
 a(dp2918
 g6
-I0
+I4
 saa(lp2919
-S'type7_armour_grade2'
+S'sidewinder_armour_reactive'
 p2920
 a(dp2921
 g6
-I32
+I4
 saa(lp2922
-S'type7_armour_grade3'
+S'type6_armour_grade1'
 p2923
 a(dp2924
 g6
-I63
+I0
 saa(lp2925
-S'type7_armour_mirrored'
+S'type6_armour_grade2'
 p2926
 a(dp2927
 g6
-I63
+I12
 saa(lp2928
-S'type7_armour_reactive'
+S'type6_armour_grade3'
 p2929
 a(dp2930
 g6
-I63
+I23
 saa(lp2931
-S'type9_armour_grade1'
+S'type6_armour_mirrored'
 p2932
 a(dp2933
 g6
-I0
+I23
 saa(lp2934
-S'type9_armour_grade2'
+S'type6_armour_reactive'
 p2935
 a(dp2936
 g6
-I75
+I23
 saa(lp2937
-S'type9_armour_grade3'
+S'type7_armour_grade1'
 p2938
 a(dp2939
 g6
-I150
+I0
 saa(lp2940
-S'type9_armour_mirrored'
+S'type7_armour_grade2'
 p2941
 a(dp2942
 g6
-I150
+I32
 saa(lp2943
-S'type9_armour_reactive'
+S'type7_armour_grade3'
 p2944
 a(dp2945
 g6
-I150
+I63
 saa(lp2946
-S'type9_military_armour_grade1'
+S'type7_armour_mirrored'
 p2947
 a(dp2948
 g6
-I0
+I63
 saa(lp2949
-S'type9_military_armour_grade2'
+S'type7_armour_reactive'
 p2950
 a(dp2951
 g6
-I75
+I63
 saa(lp2952
-S'type9_military_armour_grade3'
+S'type9_armour_grade1'
 p2953
 a(dp2954
 g6
-I150
+I0
 saa(lp2955
-S'type9_military_armour_mirrored'
+S'type9_armour_grade2'
 p2956
 a(dp2957
 g6
-I150
+I75
 saa(lp2958
-S'type9_military_armour_reactive'
+S'type9_armour_grade3'
 p2959
 a(dp2960
 g6
 I150
 saa(lp2961
-S'typex_2_armour_grade1'
+S'type9_armour_mirrored'
 p2962
 a(dp2963
 g6
-I0
+I150
 saa(lp2964
-S'typex_2_armour_grade2'
+S'type9_armour_reactive'
 p2965
 a(dp2966
 g6
-I40
+I150
 saa(lp2967
-S'typex_2_armour_grade3'
+S'type9_military_armour_grade1'
 p2968
 a(dp2969
 g6
-I78
+I0
 saa(lp2970
-S'typex_2_armour_mirrored'
+S'type9_military_armour_grade2'
 p2971
 a(dp2972
 g6
-I78
+I75
 saa(lp2973
-S'typex_2_armour_reactive'
+S'type9_military_armour_grade3'
 p2974
 a(dp2975
 g6
-I78
+I150
 saa(lp2976
-S'typex_3_armour_grade1'
+S'type9_military_armour_mirrored'
 p2977
 a(dp2978
 g6
-I0
+I150
 saa(lp2979
-S'typex_3_armour_grade2'
+S'type9_military_armour_reactive'
 p2980
 a(dp2981
 g6
-I40
+I150
 saa(lp2982
-S'typex_3_armour_grade3'
+S'typex_2_armour_grade1'
 p2983
 a(dp2984
 g6
-I78
+I0
 saa(lp2985
-S'typex_3_armour_mirrored'
+S'typex_2_armour_grade2'
 p2986
 a(dp2987
 g6
-I78
+I40
 saa(lp2988
-S'typex_3_armour_reactive'
+S'typex_2_armour_grade3'
 p2989
 a(dp2990
 g6
 I78
 saa(lp2991
-S'typex_armour_grade1'
+S'typex_2_armour_mirrored'
 p2992
 a(dp2993
 g6
-I0
+I78
 saa(lp2994
-S'typex_armour_grade2'
+S'typex_2_armour_reactive'
 p2995
 a(dp2996
 g6
-I40
+I78
 saa(lp2997
-S'typex_armour_grade3'
+S'typex_3_armour_grade1'
 p2998
 a(dp2999
 g6
-I78
+I0
 saa(lp3000
-S'typex_armour_mirrored'
+S'typex_3_armour_grade2'
 p3001
 a(dp3002
 g6
-I78
+I40
 saa(lp3003
-S'typex_armour_reactive'
+S'typex_3_armour_grade3'
 p3004
 a(dp3005
 g6
 I78
 saa(lp3006
-S'viper_armour_grade1'
+S'typex_3_armour_mirrored'
 p3007
 a(dp3008
 g6
-I0
+I78
 saa(lp3009
-S'viper_armour_grade2'
+S'typex_3_armour_reactive'
 p3010
 a(dp3011
 g6
-I5
+I78
 saa(lp3012
-S'viper_armour_grade3'
+S'typex_armour_grade1'
 p3013
 a(dp3014
 g6
-I9
+I0
 saa(lp3015
-S'viper_armour_mirrored'
+S'typex_armour_grade2'
 p3016
 a(dp3017
 g6
-I9
+I40
 saa(lp3018
-S'viper_armour_reactive'
+S'typex_armour_grade3'
 p3019
 a(dp3020
 g6
-I9
+I78
 saa(lp3021
-S'viper_mkiv_armour_grade1'
+S'typex_armour_mirrored'
 p3022
 a(dp3023
 g6
-I0
+I78
 saa(lp3024
-S'viper_mkiv_armour_grade2'
+S'typex_armour_reactive'
 p3025
 a(dp3026
 g6
-I5
+I78
 saa(lp3027
-S'viper_mkiv_armour_grade3'
+S'viper_armour_grade1'
 p3028
 a(dp3029
 g6
-I9
+I0
 saa(lp3030
-S'viper_mkiv_armour_mirrored'
+S'viper_armour_grade2'
 p3031
 a(dp3032
 g6
-I9
+I5
 saa(lp3033
-S'viper_mkiv_armour_reactive'
+S'viper_armour_grade3'
 p3034
 a(dp3035
 g6
 I9
 saa(lp3036
-S'vulture_armour_grade1'
+S'viper_armour_mirrored'
 p3037
 a(dp3038
 g6
-I0
+I9
 saa(lp3039
-S'vulture_armour_grade2'
+S'viper_armour_reactive'
 p3040
 a(dp3041
 g6
-I17
+I9
 saa(lp3042
-S'vulture_armour_grade3'
+S'viper_mkiv_armour_grade1'
 p3043
 a(dp3044
 g6
-I35
+I0
 saa(lp3045
-S'vulture_armour_mirrored'
+S'viper_mkiv_armour_grade2'
 p3046
 a(dp3047
 g6
-I35
+I5
 saa(lp3048
-S'vulture_armour_reactive'
+S'viper_mkiv_armour_grade3'
 p3049
 a(dp3050
 g6
+I9
+saa(lp3051
+S'viper_mkiv_armour_mirrored'
+p3052
+a(dp3053
+g6
+I9
+saa(lp3054
+S'viper_mkiv_armour_reactive'
+p3055
+a(dp3056
+g6
+I9
+saa(lp3057
+S'vulture_armour_grade1'
+p3058
+a(dp3059
+g6
+I0
+saa(lp3060
+S'vulture_armour_grade2'
+p3061
+a(dp3062
+g6
+I17
+saa(lp3063
+S'vulture_armour_grade3'
+p3064
+a(dp3065
+g6
 I35
-saatRp3051
+saa(lp3066
+S'vulture_armour_mirrored'
+p3067
+a(dp3068
+g6
+I35
+saa(lp3069
+S'vulture_armour_reactive'
+p3070
+a(dp3071
+g6
+I35
+saatRp3072
 .
\ No newline at end of file
diff --git a/outfitting.py b/outfitting.py
index e1d2112e..04bbdecd 100644
--- a/outfitting.py
+++ b/outfitting.py
@@ -264,9 +264,6 @@ fighter_rating_map = {
 misc_internal_map = {
     ('detailedsurfacescanner',      'tiny')         : ('Detailed Surface Scanner', 'C'),
     ('dockingcomputer',             'standard')     : ('Standard Docking Computer', 'E'),
-    ('stellarbodydiscoveryscanner', 'standard')     : ('Basic Discovery Scanner', 'E'),
-    ('stellarbodydiscoveryscanner', 'intermediate') : ('Intermediate Discovery Scanner', 'D'),
-    ('stellarbodydiscoveryscanner', 'advanced')     : ('Advanced Discovery Scanner', 'C'),
 }
 
 standard_map = {
diff --git a/ships.p b/ships.p
index 035f8b41..957c6610 100644
--- a/ships.p
+++ b/ships.p
@@ -160,64 +160,76 @@ a(dp81
 g6
 I320
 saa(lp82
-S'Orca'
+S'Krait Phantom'
 p83
 a(dp84
 g6
-I290
+I270
 saa(lp85
-S'Python'
+S'Mamba'
 p86
 a(dp87
 g6
-I350
+I250
 saa(lp88
-S'Sidewinder'
+S'Orca'
 p89
 a(dp90
 g6
-I25
+I290
 saa(lp91
-S'Type-10 Defender'
+S'Python'
 p92
 a(dp93
 g6
-I1200
+I350
 saa(lp94
-S'Type-6 Transporter'
+S'Sidewinder'
 p95
 a(dp96
 g6
-I155
+I25
 saa(lp97
-S'Type-7 Transporter'
+S'Type-10 Defender'
 p98
 a(dp99
 g6
-I350
+I1200
 saa(lp100
-S'Type-9 Heavy'
+S'Type-6 Transporter'
 p101
 a(dp102
 g6
-I850
+I155
 saa(lp103
-S'Viper MkIII'
+S'Type-7 Transporter'
 p104
 a(dp105
 g6
-I50
+I350
 saa(lp106
-S'Viper MkIV'
+S'Type-9 Heavy'
 p107
 a(dp108
 g6
-I190
+I850
 saa(lp109
-S'Vulture'
+S'Viper MkIII'
 p110
 a(dp111
 g6
+I50
+saa(lp112
+S'Viper MkIV'
+p113
+a(dp114
+g6
+I190
+saa(lp115
+S'Vulture'
+p116
+a(dp117
+g6
 I230
-saatRp112
+saatRp118
 .
\ No newline at end of file