diff --git a/ChangeLog.md b/ChangeLog.md
index 1ae19f5..4c78cd7 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -16,6 +16,7 @@
   * Update specs of Diamondback Explorer as per 2.3
   * Add ED ID for Rocket Propelled FSD Disruptor
   * Fix ED name for target lock breaker special
+  * Update scan range and angle information for sensors
 
 #2.2.19
   * Remove shot speed modification - it is directly tied to range
diff --git a/dist/index.js b/dist/index.js
index a8b8ac5..7f6aca2 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -5810,6 +5810,7 @@ module.exports = {
         weprate: 1.8
       } ],
       s: [ {
+        angle: 30,
         class: 8,
         cost: 697580,
         edID: 128064253,
@@ -5822,6 +5823,7 @@ module.exports = {
         range: 5.12,
         rating: "E"
       }, {
+        angle: 30,
         class: 8,
         cost: 1743960,
         edID: 128064254,
@@ -5834,6 +5836,7 @@ module.exports = {
         range: 5.76,
         rating: "D"
       }, {
+        angle: 30,
         class: 8,
         cost: 4359900,
         edID: 128064255,
@@ -5846,6 +5849,7 @@ module.exports = {
         range: 6.4,
         rating: "C"
       }, {
+        angle: 30,
         class: 8,
         cost: 10899760,
         edID: 128064256,
@@ -5858,6 +5862,7 @@ module.exports = {
         range: 7.04,
         rating: "B"
       }, {
+        angle: 30,
         class: 8,
         cost: 27249390,
         edID: 128064257,
@@ -5870,6 +5875,7 @@ module.exports = {
         range: 7.68,
         rating: "A"
       }, {
+        angle: 30,
         class: 7,
         cost: 249140,
         edID: 128064248,
@@ -5882,6 +5888,7 @@ module.exports = {
         range: 4.96,
         rating: "E"
       }, {
+        angle: 30,
         class: 7,
         cost: 622840,
         edID: 128064249,
@@ -5894,6 +5901,7 @@ module.exports = {
         range: 5.58,
         rating: "D"
       }, {
+        angle: 30,
         class: 7,
         cost: 1557110,
         edID: 128064250,
@@ -5906,6 +5914,7 @@ module.exports = {
         range: 6.2,
         rating: "C"
       }, {
+        angle: 30,
         class: 7,
         cost: 3892770,
         edID: 128064251,
@@ -5918,6 +5927,7 @@ module.exports = {
         range: 6.82,
         rating: "B"
       }, {
+        angle: 30,
         class: 7,
         cost: 9731930,
         edID: 128064252,
@@ -5930,6 +5940,7 @@ module.exports = {
         range: 7.44,
         rating: "A"
       }, {
+        angle: 30,
         class: 6,
         cost: 88980,
         edID: 128064243,
@@ -5942,6 +5953,7 @@ module.exports = {
         range: 4.8,
         rating: "E"
       }, {
+        angle: 30,
         class: 6,
         cost: 222440,
         edID: 128064244,
@@ -5954,6 +5966,7 @@ module.exports = {
         range: 5.4,
         rating: "D"
       }, {
+        angle: 30,
         class: 6,
         cost: 556110,
         edID: 128064245,
@@ -5966,6 +5979,7 @@ module.exports = {
         range: 6,
         rating: "C"
       }, {
+        angle: 30,
         class: 6,
         cost: 1390280,
         edID: 128064246,
@@ -5978,6 +5992,7 @@ module.exports = {
         range: 6.6,
         rating: "B"
       }, {
+        angle: 30,
         class: 6,
         cost: 3475690,
         edID: 128064247,
@@ -5990,6 +6005,7 @@ module.exports = {
         range: 7.2,
         rating: "A"
       }, {
+        angle: 30,
         class: 5,
         cost: 31780,
         edID: 128064238,
@@ -6002,6 +6018,7 @@ module.exports = {
         range: 4.64,
         rating: "E"
       }, {
+        angle: 30,
         class: 5,
         cost: 79440,
         edID: 128064239,
@@ -6014,6 +6031,7 @@ module.exports = {
         range: 5.22,
         rating: "D"
       }, {
+        angle: 30,
         class: 5,
         cost: 198610,
         edID: 128064240,
@@ -6026,6 +6044,7 @@ module.exports = {
         range: 5.8,
         rating: "C"
       }, {
+        angle: 30,
         class: 5,
         cost: 496530,
         edID: 128064241,
@@ -6038,6 +6057,7 @@ module.exports = {
         range: 6.38,
         rating: "B"
       }, {
+        angle: 30,
         class: 5,
         cost: 1241320,
         edID: 128064242,
@@ -6050,6 +6070,7 @@ module.exports = {
         range: 6.96,
         rating: "A"
       }, {
+        angle: 30,
         class: 4,
         cost: 11350,
         edID: 128064233,
@@ -6062,6 +6083,7 @@ module.exports = {
         range: 4.48,
         rating: "E"
       }, {
+        angle: 30,
         class: 4,
         cost: 28370,
         edID: 128064234,
@@ -6074,6 +6096,7 @@ module.exports = {
         range: 5.04,
         rating: "D"
       }, {
+        angle: 30,
         class: 4,
         cost: 70930,
         edID: 128064235,
@@ -6086,6 +6109,7 @@ module.exports = {
         range: 5.6,
         rating: "C"
       }, {
+        angle: 30,
         class: 4,
         cost: 177330,
         edID: 128064236,
@@ -6098,6 +6122,7 @@ module.exports = {
         range: 6.16,
         rating: "B"
       }, {
+        angle: 30,
         class: 4,
         cost: 443330,
         edID: 128064237,
@@ -6110,6 +6135,7 @@ module.exports = {
         range: 6.72,
         rating: "A"
       }, {
+        angle: 30,
         class: 3,
         cost: 4050,
         edID: 128064228,
@@ -6122,6 +6148,7 @@ module.exports = {
         range: 4.32,
         rating: "E"
       }, {
+        angle: 30,
         class: 3,
         cost: 10130,
         edID: 128064229,
@@ -6134,6 +6161,7 @@ module.exports = {
         range: 4.86,
         rating: "D"
       }, {
+        angle: 30,
         class: 3,
         cost: 25330,
         edID: 128064230,
@@ -6146,6 +6174,7 @@ module.exports = {
         range: 5.4,
         rating: "C"
       }, {
+        angle: 30,
         class: 3,
         cost: 63330,
         edID: 128064231,
@@ -6158,6 +6187,7 @@ module.exports = {
         range: 5.94,
         rating: "B"
       }, {
+        angle: 30,
         class: 3,
         cost: 158330,
         edID: 128064232,
@@ -6170,6 +6200,7 @@ module.exports = {
         range: 6.48,
         rating: "A"
       }, {
+        angle: 30,
         class: 2,
         cost: 1450,
         edID: 128064223,
@@ -6182,6 +6213,7 @@ module.exports = {
         range: 4.16,
         rating: "E"
       }, {
+        angle: 30,
         class: 2,
         cost: 3620,
         edID: 128064224,
@@ -6194,6 +6226,7 @@ module.exports = {
         range: 4.68,
         rating: "D"
       }, {
+        angle: 30,
         class: 2,
         cost: 9050,
         edID: 128064225,
@@ -6206,6 +6239,7 @@ module.exports = {
         range: 5.2,
         rating: "C"
       }, {
+        angle: 30,
         class: 2,
         cost: 22620,
         edID: 128064226,
@@ -6218,6 +6252,7 @@ module.exports = {
         range: 5.72,
         rating: "B"
       }, {
+        angle: 30,
         class: 2,
         cost: 56550,
         edID: 128064227,
@@ -6230,6 +6265,7 @@ module.exports = {
         range: 6.24,
         rating: "A"
       }, {
+        angle: 30,
         class: 1,
         cost: 520,
         edID: 128064218,
@@ -6242,6 +6278,7 @@ module.exports = {
         range: 4,
         rating: "E"
       }, {
+        angle: 30,
         class: 1,
         cost: 1290,
         edID: 128064219,
@@ -6254,6 +6291,7 @@ module.exports = {
         range: 4.5,
         rating: "D"
       }, {
+        angle: 30,
         class: 1,
         cost: 3230,
         edID: 128064220,
@@ -6266,6 +6304,7 @@ module.exports = {
         range: 5,
         rating: "C"
       }, {
+        angle: 30,
         class: 1,
         cost: 8080,
         edID: 128064221,
@@ -6278,6 +6317,7 @@ module.exports = {
         range: 5.5,
         rating: "B"
       }, {
+        angle: 30,
         class: 1,
         cost: 20200,
         edID: 128064222,
@@ -14412,7 +14452,7 @@ module.exports = {
             },
             features: {
               explres: [ 0, .028 ],
-              hullboost: [ -.03, 0 ],
+              hullboost: [ -.01, 0 ],
               kinres: [ 0, .024 ],
               mass: [ -.04, -.15 ],
               thermres: [ 0, .02 ]
@@ -14425,7 +14465,7 @@ module.exports = {
             },
             features: {
               explres: [ .014, .056 ],
-              hullboost: [ -.02, -.01 ],
+              hullboost: [ -.03, -.02 ],
               kinres: [ .012, .048 ],
               mass: [ -.08, -.25 ],
               thermres: [ .01, .04 ]
@@ -14439,7 +14479,7 @@ module.exports = {
             },
             features: {
               explres: [ .028, .084 ],
-              hullboost: [ -.07, -.05 ],
+              hullboost: [ -.05, -.03 ],
               kinres: [ .024, .072 ],
               mass: [ -.12, -.35 ],
               thermres: [ .02, .06 ]
@@ -14453,7 +14493,7 @@ module.exports = {
             },
             features: {
               explres: [ .042, .112 ],
-              hullboost: [ -.09, -.07 ],
+              hullboost: [ -.06, -.05 ],
               kinres: [ .036, .096 ],
               mass: [ -.16, -.45 ],
               thermres: [ .03, .08 ]
@@ -14467,7 +14507,7 @@ module.exports = {
             },
             features: {
               explres: [ .056, .14 ],
-              hullboost: [ -.12, -.09 ],
+              hullboost: [ -.07, -.06 ],
               kinres: [ .048, .12 ],
               mass: [ -.2, -.55 ],
               thermres: [ .04, .1 ]
@@ -14549,7 +14589,7 @@ module.exports = {
             },
             features: {
               explres: [ 0, .014 ],
-              hullboost: [ .08, .22 ],
+              hullboost: [ .05, .14 ],
               kinres: [ 0, .012 ],
               mass: [ .08, 0 ],
               thermres: [ 0, .01 ]
@@ -14562,9 +14602,9 @@ module.exports = {
             },
             features: {
               explres: [ .014, .028 ],
-              hullboost: [ .18, .34 ],
+              hullboost: [ .11, .21 ],
               kinres: [ .012, .024 ],
-              mass: [ .15, .04 ],
+              mass: [ .17, .04 ],
               thermres: [ .01, .02 ]
             }
           },
@@ -14576,9 +14616,9 @@ module.exports = {
             },
             features: {
               explres: [ .028, .042 ],
-              hullboost: [ .28, .45 ],
+              hullboost: [ .17, .28 ],
               kinres: [ .024, .036 ],
-              mass: [ .23, .1 ],
+              mass: [ .25, .1 ],
               thermres: [ .02, .03 ]
             }
           },
@@ -14590,9 +14630,9 @@ module.exports = {
             },
             features: {
               explres: [ .042, .056 ],
-              hullboost: [ .35, .56 ],
+              hullboost: [ .22, .35 ],
               kinres: [ .036, .048 ],
-              mass: [ .31, .14 ],
+              mass: [ .32, .15 ],
               thermres: [ .03, .04 ]
             }
           },
@@ -14604,7 +14644,7 @@ module.exports = {
             },
             features: {
               explres: [ .056, .07 ],
-              hullboost: [ .45, .68 ],
+              hullboost: [ .28, .41 ],
               kinres: [ .048, .06 ],
               mass: [ .4, .2 ],
               thermres: [ .04, .05 ]
@@ -14698,7 +14738,7 @@ module.exports = {
             },
             features: {
               explres: [ -.112, -.056 ],
-              kinres: [ -.096, -.048 ],
+              kinres: [ -.066, -.048 ],
               thermres: [ .1, .16 ]
             }
           },
@@ -16984,7 +17024,7 @@ module.exports = {
             },
             features: {
               power: [ .2, .1 ],
-              scanangle: [ -.2, -.1 ],
+              angle: [ -.2, -.1 ],
               range: [ .1, .2 ]
             }
           },
@@ -16995,7 +17035,7 @@ module.exports = {
             },
             features: {
               power: [ .4, .2 ],
-              scanangle: [ -.3, -.15 ],
+              angle: [ -.3, -.15 ],
               range: [ .2, .4 ]
             }
           },
@@ -17007,7 +17047,7 @@ module.exports = {
             },
             features: {
               power: [ .6, .3 ],
-              scanangle: [ -.4, -.2 ],
+              angle: [ -.4, -.2 ],
               range: [ .3, .6 ]
             }
           },
@@ -17019,7 +17059,7 @@ module.exports = {
             },
             features: {
               power: [ .8, .4 ],
-              scanangle: [ -.5, -.25 ],
+              angle: [ -.5, -.25 ],
               range: [ .4, .8 ]
             }
           },
@@ -17031,7 +17071,7 @@ module.exports = {
             },
             features: {
               power: [ 1, .5 ],
-              scanangle: [ -.6, -.3 ],
+              angle: [ -.6, -.3 ],
               range: [ .5, 1 ]
             }
           }
@@ -18327,7 +18367,7 @@ module.exports = {
             },
             features: {
               power: [ .2, .1 ],
-              scanangle: [ -.2, -.1 ],
+              angle: [ -.2, -.1 ],
               range: [ .1, .2 ]
             }
           },
@@ -18338,7 +18378,7 @@ module.exports = {
             },
             features: {
               power: [ .4, .2 ],
-              scanangle: [ -.3, -.15 ],
+              angle: [ -.3, -.15 ],
               range: [ .2, .4 ]
             }
           },
@@ -18350,7 +18390,7 @@ module.exports = {
             },
             features: {
               power: [ .6, .3 ],
-              scanangle: [ -.4, -.2 ],
+              angle: [ -.4, -.2 ],
               range: [ .3, .6 ]
             }
           },
@@ -18362,7 +18402,7 @@ module.exports = {
             },
             features: {
               power: [ .8, .4 ],
-              scanangle: [ -.5, -.25 ],
+              angle: [ -.5, -.25 ],
               range: [ .4, .8 ]
             }
           },
@@ -18374,7 +18414,7 @@ module.exports = {
             },
             features: {
               power: [ 1, .5 ],
-              scanangle: [ -.6, -.3 ],
+              angle: [ -.6, -.3 ],
               range: [ .5, 1 ]
             }
           }
@@ -18391,7 +18431,7 @@ module.exports = {
             },
             features: {
               mass: [ .4, .2 ],
-              scanangle: [ .2, .4 ],
+              angle: [ .2, .4 ],
               scantime: [ .2, .1 ]
             }
           },
@@ -18402,7 +18442,7 @@ module.exports = {
             },
             features: {
               mass: [ .8, .4 ],
-              scanangle: [ .4, .8 ],
+              angle: [ .4, .8 ],
               scantime: [ .4, .2 ]
             }
           },
@@ -18414,7 +18454,7 @@ module.exports = {
             },
             features: {
               mass: [ 1.2, .6 ],
-              scanangle: [ .6, 1.2 ],
+              angle: [ .6, 1.2 ],
               scantime: [ .6, .3 ]
             }
           },
@@ -18426,7 +18466,7 @@ module.exports = {
             },
             features: {
               mass: [ 1.2, .6 ],
-              scanangle: [ .8, 1.6 ],
+              angle: [ .8, 1.6 ],
               scantime: [ .8, .4 ]
             }
           },
@@ -18438,7 +18478,7 @@ module.exports = {
             },
             features: {
               mass: [ 2, 1 ],
-              scanangle: [ 1, 2 ],
+              angle: [ 1, 2 ],
               scantime: [ 1, .5 ]
             }
           }
@@ -18519,7 +18559,7 @@ module.exports = {
             },
             features: {
               mass: [ .4, .2 ],
-              scanangle: [ .2, .4 ],
+              angle: [ .2, .4 ],
               scantime: [ .2, .1 ]
             }
           },
@@ -18530,7 +18570,7 @@ module.exports = {
             },
             features: {
               mass: [ .8, .4 ],
-              scanangle: [ .4, .8 ],
+              angle: [ .4, .8 ],
               scantime: [ .4, .2 ]
             }
           },
@@ -18542,7 +18582,7 @@ module.exports = {
             },
             features: {
               mass: [ 1.2, .6 ],
-              scanangle: [ .6, 1.2 ],
+              angle: [ .6, 1.2 ],
               scantime: [ .6, .3 ]
             }
           },
@@ -18554,7 +18594,7 @@ module.exports = {
             },
             features: {
               mass: [ 1.2, .6 ],
-              scanangle: [ .8, 1.6 ],
+              angle: [ .8, 1.6 ],
               scantime: [ .8, .4 ]
             }
           },
@@ -18566,7 +18606,7 @@ module.exports = {
             },
             features: {
               mass: [ 2, 1 ],
-              scanangle: [ 1, 2 ],
+              angle: [ 1, 2 ],
               scantime: [ 1, .5 ]
             }
           }
@@ -18584,7 +18624,7 @@ module.exports = {
             features: {
               integrity: [ -.15, -.1 ],
               mass: [ -.2, -.4 ],
-              scanangle: [ -.1, -.05 ]
+              angle: [ -.1, -.05 ]
             }
           },
           "2": {
@@ -18595,7 +18635,7 @@ module.exports = {
             features: {
               integrity: [ -.3, -.2 ],
               mass: [ -.3, -.5 ],
-              scanangle: [ -.15, -.1 ]
+              angle: [ -.15, -.1 ]
             }
           },
           "3": {
@@ -18607,7 +18647,7 @@ module.exports = {
             features: {
               integrity: [ -.45, -.3 ],
               mass: [ -.4, -.6 ],
-              scanangle: [ -.2, -.15 ]
+              angle: [ -.2, -.15 ]
             }
           },
           "4": {
@@ -18619,7 +18659,7 @@ module.exports = {
             features: {
               integrity: [ -.6, -.4 ],
               mass: [ -.5, -.7 ],
-              scanangle: [ -.25, -.2 ]
+              angle: [ -.25, -.2 ]
             }
           },
           "5": {
@@ -18631,7 +18671,7 @@ module.exports = {
             features: {
               integrity: [ -.75, -.5 ],
               mass: [ -.6, -.8 ],
-              scanangle: [ -.3, -.25 ]
+              angle: [ -.3, -.25 ]
             }
           }
         },
@@ -18647,8 +18687,8 @@ module.exports = {
             },
             features: {
               mass: [ .4, .2 ],
-              scanangle: [ -.2, -.1 ],
-              scanrange: [ .1, .14 ]
+              angle: [ -.2, -.1 ],
+              range: [ .1, .14 ]
             }
           },
           "2": {
@@ -18658,8 +18698,8 @@ module.exports = {
             },
             features: {
               mass: [ .8, .4 ],
-              scanangle: [ -.3, -.15 ],
-              scanrange: [ .2, .3 ]
+              angle: [ -.3, -.15 ],
+              range: [ .2, .3 ]
             }
           },
           "3": {
@@ -18670,8 +18710,8 @@ module.exports = {
             },
             features: {
               mass: [ 1.2, .6 ],
-              scanangle: [ -.4, -.2 ],
-              scanrange: [ .3, .45 ]
+              angle: [ -.4, -.2 ],
+              range: [ .3, .45 ]
             }
           },
           "4": {
@@ -18682,8 +18722,8 @@ module.exports = {
             },
             features: {
               mass: [ 1.6, .8 ],
-              scanangle: [ -.5, -.25 ],
-              scanrange: [ .4, .6 ]
+              angle: [ -.5, -.25 ],
+              range: [ .4, .6 ]
             }
           },
           "5": {
@@ -18694,8 +18734,8 @@ module.exports = {
             },
             features: {
               mass: [ 2, 1 ],
-              scanangle: [ -.6, -.3 ],
-              scanrange: [ .5, .75 ]
+              angle: [ -.6, -.3 ],
+              range: [ .5, .75 ]
             }
           }
         },
@@ -18711,8 +18751,8 @@ module.exports = {
             },
             features: {
               power: [ .2, .1 ],
-              scanangle: [ .2, .4 ],
-              scanrange: [ -.08, -.05 ]
+              angle: [ .2, .4 ],
+              range: [ -.08, -.05 ]
             }
           },
           "2": {
@@ -18722,8 +18762,8 @@ module.exports = {
             },
             features: {
               power: [ .4, .2 ],
-              scanangle: [ .4, .8 ],
-              scanrange: [ -.16, -.08 ]
+              angle: [ .4, .8 ],
+              range: [ -.16, -.08 ]
             }
           },
           "3": {
@@ -18734,8 +18774,8 @@ module.exports = {
             },
             features: {
               power: [ .6, .3 ],
-              scanangle: [ .6, 1.2 ],
-              scanrange: [ -.24, -.12 ]
+              angle: [ .6, 1.2 ],
+              range: [ -.24, -.12 ]
             }
           },
           "4": {
@@ -18746,8 +18786,8 @@ module.exports = {
             },
             features: {
               power: [ .8, .4 ],
-              scanangle: [ .8, 1.6 ],
-              scanrange: [ -.32, -.16 ]
+              angle: [ .8, 1.6 ],
+              range: [ -.32, -.16 ]
             }
           },
           "5": {
@@ -18758,8 +18798,8 @@ module.exports = {
             },
             features: {
               power: [ 1, .5 ],
-              scanangle: [ 1, 2 ],
-              scanrange: [ -.4, -.2 ]
+              angle: [ 1, 2 ],
+              range: [ -.4, -.2 ]
             }
           }
         },
@@ -18840,7 +18880,7 @@ module.exports = {
             features: {
               mass: [ .4, .2 ],
               power: [ .2, .1 ],
-              scanrange: [ .2, .4 ]
+              range: [ .2, .4 ]
             }
           },
           "2": {
@@ -18851,7 +18891,7 @@ module.exports = {
             features: {
               mass: [ .8, .4 ],
               power: [ .4, .2 ],
-              scanrange: [ .4, .8 ]
+              range: [ .4, .8 ]
             }
           },
           "3": {
@@ -18863,7 +18903,7 @@ module.exports = {
             features: {
               mass: [ 1.2, .6 ],
               power: [ .6, .3 ],
-              scanrange: [ .6, 1.2 ]
+              range: [ .6, 1.2 ]
             }
           },
           "4": {
@@ -18875,7 +18915,7 @@ module.exports = {
             features: {
               mass: [ 1.6, .8 ],
               power: [ .8, .4 ],
-              scanrange: [ .8, 1.6 ]
+              range: [ .8, 1.6 ]
             }
           },
           "5": {
@@ -18887,7 +18927,7 @@ module.exports = {
             features: {
               mass: [ 2, 1 ],
               power: [ 1, .5 ],
-              scanrange: [ 1, 2 ]
+              range: [ 1, 2 ]
             }
           }
         },
@@ -18904,7 +18944,7 @@ module.exports = {
             features: {
               mass: [ .4, .2 ],
               power: [ .2, .1 ],
-              scanangle: [ .2, .4 ]
+              angle: [ .2, .4 ]
             }
           },
           "2": {
@@ -18915,7 +18955,7 @@ module.exports = {
             features: {
               mass: [ .8, .4 ],
               power: [ .4, .2 ],
-              scanangle: [ .4, .8 ]
+              angle: [ .4, .8 ]
             }
           },
           "3": {
@@ -18927,7 +18967,7 @@ module.exports = {
             features: {
               mass: [ 1.2, .6 ],
               power: [ .6, .3 ],
-              scanangle: [ .6, 1.2 ]
+              angle: [ .6, 1.2 ]
             }
           },
           "4": {
@@ -18939,7 +18979,7 @@ module.exports = {
             features: {
               mass: [ 1.6, .8 ],
               power: [ .8, .4 ],
-              scanangle: [ .8, 1.6 ]
+              angle: [ .8, 1.6 ]
             }
           },
           "5": {
@@ -18951,7 +18991,7 @@ module.exports = {
             features: {
               mass: [ 2, 1 ],
               power: [ 1, .5 ],
-              scanangle: [ 1, 2 ]
+              angle: [ 1, 2 ]
             }
           }
         },
@@ -19031,7 +19071,7 @@ module.exports = {
             },
             features: {
               power: [ .2, .1 ],
-              scanangle: [ -.2, -.1 ],
+              angle: [ -.2, -.1 ],
               range: [ .1, .2 ]
             }
           },
@@ -19042,7 +19082,7 @@ module.exports = {
             },
             features: {
               power: [ .4, .2 ],
-              scanangle: [ -.3, -.15 ],
+              angle: [ -.3, -.15 ],
               range: [ .2, .4 ]
             }
           },
@@ -19054,7 +19094,7 @@ module.exports = {
             },
             features: {
               power: [ .6, .3 ],
-              scanangle: [ -.4, -.2 ],
+              angle: [ -.4, -.2 ],
               range: [ .3, .6 ]
             }
           },
@@ -19066,7 +19106,7 @@ module.exports = {
             },
             features: {
               power: [ .8, .4 ],
-              scanangle: [ -.5, -.25 ],
+              angle: [ -.5, -.25 ],
               range: [ .4, .8 ]
             }
           },
@@ -19078,7 +19118,7 @@ module.exports = {
             },
             features: {
               power: [ 1, .5 ],
-              scanangle: [ -.6, -.3 ],
+              angle: [ -.6, -.3 ],
               range: [ .5, 1 ]
             }
           }
@@ -19095,7 +19135,7 @@ module.exports = {
             },
             features: {
               mass: [ .4, .2 ],
-              scanangle: [ .2, .4 ],
+              angle: [ .2, .4 ],
               scantime: [ .2, .1 ]
             }
           },
@@ -19106,7 +19146,7 @@ module.exports = {
             },
             features: {
               mass: [ .8, .4 ],
-              scanangle: [ .4, .8 ],
+              angle: [ .4, .8 ],
               scantime: [ .4, .2 ]
             }
           },
@@ -19118,7 +19158,7 @@ module.exports = {
             },
             features: {
               mass: [ 1.2, .6 ],
-              scanangle: [ .6, 1.2 ],
+              angle: [ .6, 1.2 ],
               scantime: [ .6, .3 ]
             }
           },
@@ -19130,7 +19170,7 @@ module.exports = {
             },
             features: {
               mass: [ 1.2, .6 ],
-              scanangle: [ .8, 1.6 ],
+              angle: [ .8, 1.6 ],
               scantime: [ .8, .4 ]
             }
           },
@@ -19142,7 +19182,7 @@ module.exports = {
             },
             features: {
               mass: [ 2, 1 ],
-              scanangle: [ 1, 2 ],
+              angle: [ 1, 2 ],
               scantime: [ 1, .5 ]
             }
           }
@@ -20967,20 +21007,13 @@ module.exports = {
         method: "multiplicative",
         higherbetter: false
       },
-      scanangle: {
+      angle: {
         id: 46,
         name: "scanangle",
         type: "percentage",
         method: "multiplicative",
         higherbetter: true
       },
-      scanrange: {
-        id: 47,
-        name: "scanrange",
-        type: "percentage",
-        method: "multiplicative",
-        higherbetter: true
-      },
       scantime: {
         id: 48,
         name: "scantime",
@@ -21500,7 +21533,7 @@ module.exports = {
           CargoScanner_Shielded: [ 1, 2, 3, 4, 5 ],
           Sensor_CargoScanner_WideAngle: [ 1, 2, 3, 4, 5 ]
         },
-        modifications: [ "boot", "integrity", "mass", "power", "scanangle", "range", "scantime" ]
+        modifications: [ "boot", "integrity", "mass", "power", "angle", "range", "scantime" ]
       },
       dc: {
         blueprints: {},
@@ -21601,7 +21634,7 @@ module.exports = {
           KillWarrantScanner_Shielded: [ 1, 2, 3, 4, 5 ],
           Sensor_KillWarrantScanner_WideAngle: [ 1, 2, 3, 4, 5 ]
         },
-        modifications: [ "boot", "integrity", "mass", "power", "scanangle", "range", "scantime" ]
+        modifications: [ "boot", "integrity", "mass", "power", "angle", "range", "scantime" ]
       },
       ls: {
         blueprints: {
@@ -21773,7 +21806,7 @@ module.exports = {
           Sensor_Sensor_LongRange: [ 1, 2, 3, 4, 5 ],
           Sensor_Sensor_WideAngle: [ 1, 2, 3, 4, 5 ]
         },
-        modifications: [ "integrity", "mass", "power", "scanrange", "scanangle" ]
+        modifications: [ "integrity", "mass", "power", "range", "angle" ]
       },
       sb: {
         blueprints: {
@@ -21811,7 +21844,7 @@ module.exports = {
           Sensor_SurfaceScanner_LongRange: [ 1, 2, 3, 4, 5 ],
           Sensor_SurfaceScanner_WideAngle: [ 1, 2, 3, 4, 5 ]
         },
-        modifications: [ "mass", "power", "scanangle", "scanrange", "scantime" ]
+        modifications: [ "mass", "power", "angle", "range", "scantime" ]
       },
       t: {
         blueprints: {
@@ -21852,7 +21885,7 @@ module.exports = {
           WakeScanner_Shielded: [ 1, 2, 3, 4, 5 ],
           Sensor_WakeScanner_WideAngle: [ 1, 2, 3, 4, 5 ]
         },
-        modifications: [ "boot", "integrity", "mass", "power", "scanangle", "range", "scantime" ]
+        modifications: [ "boot", "integrity", "mass", "power", "angle", "range", "scantime" ]
       }
     },
     specials: {
diff --git a/dist/index.json b/dist/index.json
index c5d415c..e940123 100644
--- a/dist/index.json
+++ b/dist/index.json
@@ -7739,6 +7739,7 @@
 			],
 			"s": [
 				{
+					"angle": 30,
 					"class": 8,
 					"cost": 697580,
 					"edID": 128064253,
@@ -7752,6 +7753,7 @@
 					"rating": "E"
 				},
 				{
+					"angle": 30,
 					"class": 8,
 					"cost": 1743960,
 					"edID": 128064254,
@@ -7765,6 +7767,7 @@
 					"rating": "D"
 				},
 				{
+					"angle": 30,
 					"class": 8,
 					"cost": 4359900,
 					"edID": 128064255,
@@ -7778,6 +7781,7 @@
 					"rating": "C"
 				},
 				{
+					"angle": 30,
 					"class": 8,
 					"cost": 10899760,
 					"edID": 128064256,
@@ -7791,6 +7795,7 @@
 					"rating": "B"
 				},
 				{
+					"angle": 30,
 					"class": 8,
 					"cost": 27249390,
 					"edID": 128064257,
@@ -7804,6 +7809,7 @@
 					"rating": "A"
 				},
 				{
+					"angle": 30,
 					"class": 7,
 					"cost": 249140,
 					"edID": 128064248,
@@ -7817,6 +7823,7 @@
 					"rating": "E"
 				},
 				{
+					"angle": 30,
 					"class": 7,
 					"cost": 622840,
 					"edID": 128064249,
@@ -7830,6 +7837,7 @@
 					"rating": "D"
 				},
 				{
+					"angle": 30,
 					"class": 7,
 					"cost": 1557110,
 					"edID": 128064250,
@@ -7843,6 +7851,7 @@
 					"rating": "C"
 				},
 				{
+					"angle": 30,
 					"class": 7,
 					"cost": 3892770,
 					"edID": 128064251,
@@ -7856,6 +7865,7 @@
 					"rating": "B"
 				},
 				{
+					"angle": 30,
 					"class": 7,
 					"cost": 9731930,
 					"edID": 128064252,
@@ -7869,6 +7879,7 @@
 					"rating": "A"
 				},
 				{
+					"angle": 30,
 					"class": 6,
 					"cost": 88980,
 					"edID": 128064243,
@@ -7882,6 +7893,7 @@
 					"rating": "E"
 				},
 				{
+					"angle": 30,
 					"class": 6,
 					"cost": 222440,
 					"edID": 128064244,
@@ -7895,6 +7907,7 @@
 					"rating": "D"
 				},
 				{
+					"angle": 30,
 					"class": 6,
 					"cost": 556110,
 					"edID": 128064245,
@@ -7908,6 +7921,7 @@
 					"rating": "C"
 				},
 				{
+					"angle": 30,
 					"class": 6,
 					"cost": 1390280,
 					"edID": 128064246,
@@ -7921,6 +7935,7 @@
 					"rating": "B"
 				},
 				{
+					"angle": 30,
 					"class": 6,
 					"cost": 3475690,
 					"edID": 128064247,
@@ -7934,6 +7949,7 @@
 					"rating": "A"
 				},
 				{
+					"angle": 30,
 					"class": 5,
 					"cost": 31780,
 					"edID": 128064238,
@@ -7947,6 +7963,7 @@
 					"rating": "E"
 				},
 				{
+					"angle": 30,
 					"class": 5,
 					"cost": 79440,
 					"edID": 128064239,
@@ -7960,6 +7977,7 @@
 					"rating": "D"
 				},
 				{
+					"angle": 30,
 					"class": 5,
 					"cost": 198610,
 					"edID": 128064240,
@@ -7973,6 +7991,7 @@
 					"rating": "C"
 				},
 				{
+					"angle": 30,
 					"class": 5,
 					"cost": 496530,
 					"edID": 128064241,
@@ -7986,6 +8005,7 @@
 					"rating": "B"
 				},
 				{
+					"angle": 30,
 					"class": 5,
 					"cost": 1241320,
 					"edID": 128064242,
@@ -7999,6 +8019,7 @@
 					"rating": "A"
 				},
 				{
+					"angle": 30,
 					"class": 4,
 					"cost": 11350,
 					"edID": 128064233,
@@ -8012,6 +8033,7 @@
 					"rating": "E"
 				},
 				{
+					"angle": 30,
 					"class": 4,
 					"cost": 28370,
 					"edID": 128064234,
@@ -8025,6 +8047,7 @@
 					"rating": "D"
 				},
 				{
+					"angle": 30,
 					"class": 4,
 					"cost": 70930,
 					"edID": 128064235,
@@ -8038,6 +8061,7 @@
 					"rating": "C"
 				},
 				{
+					"angle": 30,
 					"class": 4,
 					"cost": 177330,
 					"edID": 128064236,
@@ -8051,6 +8075,7 @@
 					"rating": "B"
 				},
 				{
+					"angle": 30,
 					"class": 4,
 					"cost": 443330,
 					"edID": 128064237,
@@ -8064,6 +8089,7 @@
 					"rating": "A"
 				},
 				{
+					"angle": 30,
 					"class": 3,
 					"cost": 4050,
 					"edID": 128064228,
@@ -8077,6 +8103,7 @@
 					"rating": "E"
 				},
 				{
+					"angle": 30,
 					"class": 3,
 					"cost": 10130,
 					"edID": 128064229,
@@ -8090,6 +8117,7 @@
 					"rating": "D"
 				},
 				{
+					"angle": 30,
 					"class": 3,
 					"cost": 25330,
 					"edID": 128064230,
@@ -8103,6 +8131,7 @@
 					"rating": "C"
 				},
 				{
+					"angle": 30,
 					"class": 3,
 					"cost": 63330,
 					"edID": 128064231,
@@ -8116,6 +8145,7 @@
 					"rating": "B"
 				},
 				{
+					"angle": 30,
 					"class": 3,
 					"cost": 158330,
 					"edID": 128064232,
@@ -8129,6 +8159,7 @@
 					"rating": "A"
 				},
 				{
+					"angle": 30,
 					"class": 2,
 					"cost": 1450,
 					"edID": 128064223,
@@ -8142,6 +8173,7 @@
 					"rating": "E"
 				},
 				{
+					"angle": 30,
 					"class": 2,
 					"cost": 3620,
 					"edID": 128064224,
@@ -8155,6 +8187,7 @@
 					"rating": "D"
 				},
 				{
+					"angle": 30,
 					"class": 2,
 					"cost": 9050,
 					"edID": 128064225,
@@ -8168,6 +8201,7 @@
 					"rating": "C"
 				},
 				{
+					"angle": 30,
 					"class": 2,
 					"cost": 22620,
 					"edID": 128064226,
@@ -8181,6 +8215,7 @@
 					"rating": "B"
 				},
 				{
+					"angle": 30,
 					"class": 2,
 					"cost": 56550,
 					"edID": 128064227,
@@ -8194,6 +8229,7 @@
 					"rating": "A"
 				},
 				{
+					"angle": 30,
 					"class": 1,
 					"cost": 520,
 					"edID": 128064218,
@@ -8207,6 +8243,7 @@
 					"rating": "E"
 				},
 				{
+					"angle": 30,
 					"class": 1,
 					"cost": 1290,
 					"edID": 128064219,
@@ -8220,6 +8257,7 @@
 					"rating": "D"
 				},
 				{
+					"angle": 30,
 					"class": 1,
 					"cost": 3230,
 					"edID": 128064220,
@@ -8233,6 +8271,7 @@
 					"rating": "C"
 				},
 				{
+					"angle": 30,
 					"class": 1,
 					"cost": 8080,
 					"edID": 128064221,
@@ -8246,6 +8285,7 @@
 					"rating": "B"
 				},
 				{
+					"angle": 30,
 					"class": 1,
 					"cost": 20200,
 					"edID": 128064222,
@@ -16941,7 +16981,7 @@
 								0.028
 							],
 							"hullboost": [
-								-0.03,
+								-0.01,
 								0
 							],
 							"kinres": [
@@ -16969,8 +17009,8 @@
 								0.056
 							],
 							"hullboost": [
-								-0.02,
-								-0.01
+								-0.03,
+								-0.02
 							],
 							"kinres": [
 								0.012,
@@ -16998,8 +17038,8 @@
 								0.084
 							],
 							"hullboost": [
-								-0.07,
-								-0.05
+								-0.05,
+								-0.03
 							],
 							"kinres": [
 								0.024,
@@ -17027,8 +17067,8 @@
 								0.112
 							],
 							"hullboost": [
-								-0.09,
-								-0.07
+								-0.06,
+								-0.05
 							],
 							"kinres": [
 								0.036,
@@ -17056,8 +17096,8 @@
 								0.14
 							],
 							"hullboost": [
-								-0.12,
-								-0.09
+								-0.07,
+								-0.06
 							],
 							"kinres": [
 								0.048,
@@ -17204,8 +17244,8 @@
 								0.014
 							],
 							"hullboost": [
-								0.08,
-								0.22
+								0.05,
+								0.14
 							],
 							"kinres": [
 								0,
@@ -17232,15 +17272,15 @@
 								0.028
 							],
 							"hullboost": [
-								0.18,
-								0.34
+								0.11,
+								0.21
 							],
 							"kinres": [
 								0.012,
 								0.024
 							],
 							"mass": [
-								0.15,
+								0.17,
 								0.04
 							],
 							"thermres": [
@@ -17261,15 +17301,15 @@
 								0.042
 							],
 							"hullboost": [
-								0.28,
-								0.45
+								0.17,
+								0.28
 							],
 							"kinres": [
 								0.024,
 								0.036
 							],
 							"mass": [
-								0.23,
+								0.25,
 								0.1
 							],
 							"thermres": [
@@ -17290,16 +17330,16 @@
 								0.056
 							],
 							"hullboost": [
-								0.35,
-								0.56
+								0.22,
+								0.35
 							],
 							"kinres": [
 								0.036,
 								0.048
 							],
 							"mass": [
-								0.31,
-								0.14
+								0.32,
+								0.15
 							],
 							"thermres": [
 								0.03,
@@ -17319,8 +17359,8 @@
 								0.07
 							],
 							"hullboost": [
-								0.45,
-								0.68
+								0.28,
+								0.41
 							],
 							"kinres": [
 								0.048,
@@ -17488,7 +17528,7 @@
 								-0.056
 							],
 							"kinres": [
-								-0.096,
+								-0.066,
 								-0.048
 							],
 							"thermres": [
@@ -21332,7 +21372,7 @@
 								0.2,
 								0.1
 							],
-							"scanangle": [
+							"angle": [
 								-0.2,
 								-0.1
 							],
@@ -21352,7 +21392,7 @@
 								0.4,
 								0.2
 							],
-							"scanangle": [
+							"angle": [
 								-0.3,
 								-0.15
 							],
@@ -21373,7 +21413,7 @@
 								0.6,
 								0.3
 							],
-							"scanangle": [
+							"angle": [
 								-0.4,
 								-0.2
 							],
@@ -21394,7 +21434,7 @@
 								0.8,
 								0.4
 							],
-							"scanangle": [
+							"angle": [
 								-0.5,
 								-0.25
 							],
@@ -21415,7 +21455,7 @@
 								1,
 								0.5
 							],
-							"scanangle": [
+							"angle": [
 								-0.6,
 								-0.3
 							],
@@ -23660,7 +23700,7 @@
 								0.2,
 								0.1
 							],
-							"scanangle": [
+							"angle": [
 								-0.2,
 								-0.1
 							],
@@ -23680,7 +23720,7 @@
 								0.4,
 								0.2
 							],
-							"scanangle": [
+							"angle": [
 								-0.3,
 								-0.15
 							],
@@ -23701,7 +23741,7 @@
 								0.6,
 								0.3
 							],
-							"scanangle": [
+							"angle": [
 								-0.4,
 								-0.2
 							],
@@ -23722,7 +23762,7 @@
 								0.8,
 								0.4
 							],
-							"scanangle": [
+							"angle": [
 								-0.5,
 								-0.25
 							],
@@ -23743,7 +23783,7 @@
 								1,
 								0.5
 							],
-							"scanangle": [
+							"angle": [
 								-0.6,
 								-0.3
 							],
@@ -23772,7 +23812,7 @@
 								0.4,
 								0.2
 							],
-							"scanangle": [
+							"angle": [
 								0.2,
 								0.4
 							],
@@ -23792,7 +23832,7 @@
 								0.8,
 								0.4
 							],
-							"scanangle": [
+							"angle": [
 								0.4,
 								0.8
 							],
@@ -23813,7 +23853,7 @@
 								1.2,
 								0.6
 							],
-							"scanangle": [
+							"angle": [
 								0.6,
 								1.2
 							],
@@ -23834,7 +23874,7 @@
 								1.2,
 								0.6
 							],
-							"scanangle": [
+							"angle": [
 								0.8,
 								1.6
 							],
@@ -23855,7 +23895,7 @@
 								2,
 								1
 							],
-							"scanangle": [
+							"angle": [
 								1,
 								2
 							],
@@ -23996,7 +24036,7 @@
 								0.4,
 								0.2
 							],
-							"scanangle": [
+							"angle": [
 								0.2,
 								0.4
 							],
@@ -24016,7 +24056,7 @@
 								0.8,
 								0.4
 							],
-							"scanangle": [
+							"angle": [
 								0.4,
 								0.8
 							],
@@ -24037,7 +24077,7 @@
 								1.2,
 								0.6
 							],
-							"scanangle": [
+							"angle": [
 								0.6,
 								1.2
 							],
@@ -24058,7 +24098,7 @@
 								1.2,
 								0.6
 							],
-							"scanangle": [
+							"angle": [
 								0.8,
 								1.6
 							],
@@ -24079,7 +24119,7 @@
 								2,
 								1
 							],
-							"scanangle": [
+							"angle": [
 								1,
 								2
 							],
@@ -24112,7 +24152,7 @@
 								-0.2,
 								-0.4
 							],
-							"scanangle": [
+							"angle": [
 								-0.1,
 								-0.05
 							]
@@ -24132,7 +24172,7 @@
 								-0.3,
 								-0.5
 							],
-							"scanangle": [
+							"angle": [
 								-0.15,
 								-0.1
 							]
@@ -24153,7 +24193,7 @@
 								-0.4,
 								-0.6
 							],
-							"scanangle": [
+							"angle": [
 								-0.2,
 								-0.15
 							]
@@ -24174,7 +24214,7 @@
 								-0.5,
 								-0.7
 							],
-							"scanangle": [
+							"angle": [
 								-0.25,
 								-0.2
 							]
@@ -24195,7 +24235,7 @@
 								-0.6,
 								-0.8
 							],
-							"scanangle": [
+							"angle": [
 								-0.3,
 								-0.25
 							]
@@ -24219,11 +24259,11 @@
 								0.4,
 								0.2
 							],
-							"scanangle": [
+							"angle": [
 								-0.2,
 								-0.1
 							],
-							"scanrange": [
+							"range": [
 								0.1,
 								0.14
 							]
@@ -24239,11 +24279,11 @@
 								0.8,
 								0.4
 							],
-							"scanangle": [
+							"angle": [
 								-0.3,
 								-0.15
 							],
-							"scanrange": [
+							"range": [
 								0.2,
 								0.3
 							]
@@ -24260,11 +24300,11 @@
 								1.2,
 								0.6
 							],
-							"scanangle": [
+							"angle": [
 								-0.4,
 								-0.2
 							],
-							"scanrange": [
+							"range": [
 								0.3,
 								0.45
 							]
@@ -24281,11 +24321,11 @@
 								1.6,
 								0.8
 							],
-							"scanangle": [
+							"angle": [
 								-0.5,
 								-0.25
 							],
-							"scanrange": [
+							"range": [
 								0.4,
 								0.6
 							]
@@ -24302,11 +24342,11 @@
 								2,
 								1
 							],
-							"scanangle": [
+							"angle": [
 								-0.6,
 								-0.3
 							],
-							"scanrange": [
+							"range": [
 								0.5,
 								0.75
 							]
@@ -24330,11 +24370,11 @@
 								0.2,
 								0.1
 							],
-							"scanangle": [
+							"angle": [
 								0.2,
 								0.4
 							],
-							"scanrange": [
+							"range": [
 								-0.08,
 								-0.05
 							]
@@ -24350,11 +24390,11 @@
 								0.4,
 								0.2
 							],
-							"scanangle": [
+							"angle": [
 								0.4,
 								0.8
 							],
-							"scanrange": [
+							"range": [
 								-0.16,
 								-0.08
 							]
@@ -24371,11 +24411,11 @@
 								0.6,
 								0.3
 							],
-							"scanangle": [
+							"angle": [
 								0.6,
 								1.2
 							],
-							"scanrange": [
+							"range": [
 								-0.24,
 								-0.12
 							]
@@ -24392,11 +24432,11 @@
 								0.8,
 								0.4
 							],
-							"scanangle": [
+							"angle": [
 								0.8,
 								1.6
 							],
-							"scanrange": [
+							"range": [
 								-0.32,
 								-0.16
 							]
@@ -24413,11 +24453,11 @@
 								1,
 								0.5
 							],
-							"scanangle": [
+							"angle": [
 								1,
 								2
 							],
-							"scanrange": [
+							"range": [
 								-0.4,
 								-0.2
 							]
@@ -24557,7 +24597,7 @@
 								0.2,
 								0.1
 							],
-							"scanrange": [
+							"range": [
 								0.2,
 								0.4
 							]
@@ -24577,7 +24617,7 @@
 								0.4,
 								0.2
 							],
-							"scanrange": [
+							"range": [
 								0.4,
 								0.8
 							]
@@ -24598,7 +24638,7 @@
 								0.6,
 								0.3
 							],
-							"scanrange": [
+							"range": [
 								0.6,
 								1.2
 							]
@@ -24619,7 +24659,7 @@
 								0.8,
 								0.4
 							],
-							"scanrange": [
+							"range": [
 								0.8,
 								1.6
 							]
@@ -24640,7 +24680,7 @@
 								1,
 								0.5
 							],
-							"scanrange": [
+							"range": [
 								1,
 								2
 							]
@@ -24669,7 +24709,7 @@
 								0.2,
 								0.1
 							],
-							"scanangle": [
+							"angle": [
 								0.2,
 								0.4
 							]
@@ -24689,7 +24729,7 @@
 								0.4,
 								0.2
 							],
-							"scanangle": [
+							"angle": [
 								0.4,
 								0.8
 							]
@@ -24710,7 +24750,7 @@
 								0.6,
 								0.3
 							],
-							"scanangle": [
+							"angle": [
 								0.6,
 								1.2
 							]
@@ -24731,7 +24771,7 @@
 								0.8,
 								0.4
 							],
-							"scanangle": [
+							"angle": [
 								0.8,
 								1.6
 							]
@@ -24752,7 +24792,7 @@
 								1,
 								0.5
 							],
-							"scanangle": [
+							"angle": [
 								1,
 								2
 							]
@@ -24889,7 +24929,7 @@
 								0.2,
 								0.1
 							],
-							"scanangle": [
+							"angle": [
 								-0.2,
 								-0.1
 							],
@@ -24909,7 +24949,7 @@
 								0.4,
 								0.2
 							],
-							"scanangle": [
+							"angle": [
 								-0.3,
 								-0.15
 							],
@@ -24930,7 +24970,7 @@
 								0.6,
 								0.3
 							],
-							"scanangle": [
+							"angle": [
 								-0.4,
 								-0.2
 							],
@@ -24951,7 +24991,7 @@
 								0.8,
 								0.4
 							],
-							"scanangle": [
+							"angle": [
 								-0.5,
 								-0.25
 							],
@@ -24972,7 +25012,7 @@
 								1,
 								0.5
 							],
-							"scanangle": [
+							"angle": [
 								-0.6,
 								-0.3
 							],
@@ -25001,7 +25041,7 @@
 								0.4,
 								0.2
 							],
-							"scanangle": [
+							"angle": [
 								0.2,
 								0.4
 							],
@@ -25021,7 +25061,7 @@
 								0.8,
 								0.4
 							],
-							"scanangle": [
+							"angle": [
 								0.4,
 								0.8
 							],
@@ -25042,7 +25082,7 @@
 								1.2,
 								0.6
 							],
-							"scanangle": [
+							"angle": [
 								0.6,
 								1.2
 							],
@@ -25063,7 +25103,7 @@
 								1.2,
 								0.6
 							],
-							"scanangle": [
+							"angle": [
 								0.8,
 								1.6
 							],
@@ -25084,7 +25124,7 @@
 								2,
 								1
 							],
-							"scanangle": [
+							"angle": [
 								1,
 								2
 							],
@@ -28265,20 +28305,13 @@
 				"method": "multiplicative",
 				"higherbetter": false
 			},
-			"scanangle": {
+			"angle": {
 				"id": 46,
 				"name": "scanangle",
 				"type": "percentage",
 				"method": "multiplicative",
 				"higherbetter": true
 			},
-			"scanrange": {
-				"id": 47,
-				"name": "scanrange",
-				"type": "percentage",
-				"method": "multiplicative",
-				"higherbetter": true
-			},
 			"scantime": {
 				"id": 48,
 				"name": "scantime",
@@ -29094,7 +29127,7 @@
 					"integrity",
 					"mass",
 					"power",
-					"scanangle",
+					"angle",
 					"range",
 					"scantime"
 				]
@@ -29490,7 +29523,7 @@
 					"integrity",
 					"mass",
 					"power",
-					"scanangle",
+					"angle",
 					"range",
 					"scantime"
 				]
@@ -30213,8 +30246,8 @@
 					"integrity",
 					"mass",
 					"power",
-					"scanrange",
-					"scanangle"
+					"range",
+					"angle"
 				]
 			},
 			"sb": {
@@ -30367,8 +30400,8 @@
 				"modifications": [
 					"mass",
 					"power",
-					"scanangle",
-					"scanrange",
+					"angle",
+					"range",
 					"scantime"
 				]
 			},
@@ -30575,7 +30608,7 @@
 					"integrity",
 					"mass",
 					"power",
-					"scanangle",
+					"angle",
 					"range",
 					"scantime"
 				]
diff --git a/modifications/blueprints.json b/modifications/blueprints.json
index 25cb0e7..9177308 100644
--- a/modifications/blueprints.json
+++ b/modifications/blueprints.json
@@ -55,7 +55,7 @@
         },
         "features": {
           "explres": [ 0, 0.028 ],
-          "hullboost": [ -0.03, 0 ],
+          "hullboost": [ -0.01, 0 ],
           "kinres": [ 0, 0.024 ],
           "mass": [ -0.04, -0.15 ],
           "thermres": [ 0, 0.02 ]
@@ -68,7 +68,7 @@
         },
         "features": {
           "explres": [ 0.014, 0.056 ],
-          "hullboost": [ -0.02, -0.01 ],
+          "hullboost": [ -0.03, -0.02 ],
           "kinres": [ 0.012, 0.048 ],
           "mass": [ -0.08, -0.25 ],
           "thermres": [ 0.01, 0.04 ]
@@ -82,7 +82,7 @@
         },
         "features": {
           "explres": [ 0.028, 0.084 ],
-          "hullboost": [ -0.07, -0.05 ],
+          "hullboost": [ -0.05, -0.03 ],
           "kinres": [ 0.024, 0.072 ],
           "mass": [ -0.12, -0.35 ],
           "thermres": [ 0.02, 0.06 ]
@@ -96,7 +96,7 @@
         },
         "features": {
           "explres": [ 0.042, 0.112 ],
-          "hullboost": [ -0.09, -0.07 ],
+          "hullboost": [ -0.06, -0.05 ],
           "kinres": [ 0.036, 0.096 ],
           "mass": [ -0.16, -0.45 ],
           "thermres": [ 0.03, 0.08 ]
@@ -110,7 +110,7 @@
         },
         "features": {
           "explres": [ 0.056, 0.14 ],
-          "hullboost": [ -0.12, -0.09 ],
+          "hullboost": [ -0.07, -0.06 ],
           "kinres": [ 0.048, 0.12 ],
           "mass": [ -0.2, -0.55 ],
           "thermres": [ 0.04, 0.1 ]
@@ -192,7 +192,7 @@
         },
         "features": {
           "explres": [ 0, 0.014 ],
-          "hullboost": [ 0.08, 0.22 ],
+          "hullboost": [ 0.05, 0.14 ],
           "kinres": [ 0, 0.012 ],
           "mass": [ 0.08, 0 ],
           "thermres": [ 0, 0.01 ]
@@ -205,9 +205,9 @@
         },
         "features": {
           "explres": [ 0.014, 0.028 ],
-          "hullboost": [ 0.18, 0.34 ],
+          "hullboost": [ 0.11, 0.21 ],
           "kinres": [ 0.012, 0.024 ],
-          "mass": [ 0.15, 0.04 ],
+          "mass": [ 0.17, 0.04 ],
           "thermres": [ 0.01, 0.02 ]
         }
       },
@@ -219,9 +219,9 @@
         },
         "features": {
           "explres": [ 0.028, 0.042 ],
-          "hullboost": [ 0.28, 0.45 ],
+          "hullboost": [ 0.17, 0.28 ],
           "kinres": [ 0.024, 0.036 ],
-          "mass": [ 0.23, 0.1 ],
+          "mass": [ 0.25, 0.1 ],
           "thermres": [ 0.02, 0.03 ]
         }
       },
@@ -233,9 +233,9 @@
         },
         "features": {
           "explres": [ 0.042, 0.056 ],
-          "hullboost": [ 0.35, 0.56 ],
+          "hullboost": [ 0.22, 0.35 ],
           "kinres": [ 0.036, 0.048 ],
-          "mass": [ 0.31, 0.14 ],
+          "mass": [ 0.32, 0.15 ],
           "thermres": [ 0.03, 0.04 ]
         }
       },
@@ -247,7 +247,7 @@
         },
         "features": {
           "explres": [ 0.056, 0.07 ],
-          "hullboost": [ 0.45, 0.68 ],
+          "hullboost": [ 0.28, 0.41 ],
           "kinres": [ 0.048, 0.06 ],
           "mass": [ 0.4, 0.2 ],
           "thermres": [ 0.04, 0.05 ]
@@ -341,7 +341,7 @@
         },
         "features": {
           "explres": [ -0.112, -0.056 ],
-          "kinres": [ -0.096, -0.048 ],
+          "kinres": [ -0.066, -0.048 ],
           "thermres": [ 0.1, 0.16 ]
         }
       },
@@ -2627,7 +2627,7 @@
         },
         "features": {
           "power": [ 0.2, 0.1 ],
-          "scanangle": [ -0.2, -0.1 ],
+          "angle": [ -0.2, -0.1 ],
           "range": [ 0.1, 0.2 ]
         }
       },
@@ -2638,7 +2638,7 @@
         },
         "features": {
           "power": [ 0.4, 0.2 ],
-          "scanangle": [ -0.3, -0.15 ],
+          "angle": [ -0.3, -0.15 ],
           "range": [ 0.2, 0.4 ]
         }
       },
@@ -2650,7 +2650,7 @@
         },
         "features": {
           "power": [ 0.6, 0.3 ],
-          "scanangle": [ -0.4, -0.2 ],
+          "angle": [ -0.4, -0.2 ],
           "range": [ 0.3, 0.6 ]
         }
       },
@@ -2662,7 +2662,7 @@
         },
         "features": {
           "power": [ 0.8, 0.4 ],
-          "scanangle": [ -0.5, -0.25 ],
+          "angle": [ -0.5, -0.25 ],
           "range": [ 0.4, 0.8 ]
         }
       },
@@ -2674,7 +2674,7 @@
         },
         "features": {
           "power": [ 1, 0.5 ],
-          "scanangle": [ -0.6, -0.3 ],
+          "angle": [ -0.6, -0.3 ],
           "range": [ 0.5, 1 ]
         }
       }
@@ -3970,7 +3970,7 @@
         },
         "features": {
           "power": [ 0.2, 0.1 ],
-          "scanangle": [ -0.2, -0.1 ],
+          "angle": [ -0.2, -0.1 ],
           "range": [ 0.1, 0.2 ]
         }
       },
@@ -3981,7 +3981,7 @@
         },
         "features": {
           "power": [ 0.4, 0.2 ],
-          "scanangle": [ -0.3, -0.15 ],
+          "angle": [ -0.3, -0.15 ],
           "range": [ 0.2, 0.4 ]
         }
       },
@@ -3993,7 +3993,7 @@
         },
         "features": {
           "power": [ 0.6, 0.3 ],
-          "scanangle": [ -0.4, -0.2 ],
+          "angle": [ -0.4, -0.2 ],
           "range": [ 0.3, 0.6 ]
         }
       },
@@ -4005,7 +4005,7 @@
         },
         "features": {
           "power": [ 0.8, 0.4 ],
-          "scanangle": [ -0.5, -0.25 ],
+          "angle": [ -0.5, -0.25 ],
           "range": [ 0.4, 0.8 ]
         }
       },
@@ -4017,7 +4017,7 @@
         },
         "features": {
           "power": [ 1, 0.5 ],
-          "scanangle": [ -0.6, -0.3 ],
+          "angle": [ -0.6, -0.3 ],
           "range": [ 0.5, 1 ]
         }
       }
@@ -4034,7 +4034,7 @@
         },
         "features": {
           "mass": [ 0.4, 0.2 ],
-          "scanangle": [ 0.2, 0.4 ],
+          "angle": [ 0.2, 0.4 ],
           "scantime": [ 0.2, 0.1 ]
         }
       },
@@ -4045,7 +4045,7 @@
         },
         "features": {
           "mass": [ 0.8, 0.4 ],
-          "scanangle": [ 0.4, 0.8 ],
+          "angle": [ 0.4, 0.8 ],
           "scantime": [ 0.4, 0.2 ]
         }
       },
@@ -4057,7 +4057,7 @@
         },
         "features": {
           "mass": [ 1.2, 0.6 ],
-          "scanangle": [ 0.6, 1.2 ],
+          "angle": [ 0.6, 1.2 ],
           "scantime": [ 0.6, 0.3 ]
         }
       },
@@ -4069,7 +4069,7 @@
         },
         "features": {
           "mass": [ 1.2, 0.6 ],
-          "scanangle": [ 0.8, 1.6 ],
+          "angle": [ 0.8, 1.6 ],
           "scantime": [ 0.8, 0.4 ]
         }
       },
@@ -4081,7 +4081,7 @@
         },
         "features": {
           "mass": [ 2, 1 ],
-          "scanangle": [ 1, 2 ],
+          "angle": [ 1, 2 ],
           "scantime": [ 1, 0.5 ]
         }
       }
@@ -4162,7 +4162,7 @@
         },
         "features": {
           "mass": [ 0.4, 0.2 ],
-          "scanangle": [ 0.2, 0.4 ],
+          "angle": [ 0.2, 0.4 ],
           "scantime": [ 0.2, 0.1 ]
         }
       },
@@ -4173,7 +4173,7 @@
         },
         "features": {
           "mass": [ 0.8, 0.4 ],
-          "scanangle": [ 0.4, 0.8 ],
+          "angle": [ 0.4, 0.8 ],
           "scantime": [ 0.4, 0.2 ]
         }
       },
@@ -4185,7 +4185,7 @@
         },
         "features": {
           "mass": [ 1.2, 0.6 ],
-          "scanangle": [ 0.6, 1.2 ],
+          "angle": [ 0.6, 1.2 ],
           "scantime": [ 0.6, 0.3 ]
         }
       },
@@ -4197,7 +4197,7 @@
         },
         "features": {
           "mass": [ 1.2, 0.6 ],
-          "scanangle": [ 0.8, 1.6 ],
+          "angle": [ 0.8, 1.6 ],
           "scantime": [ 0.8, 0.4 ]
         }
       },
@@ -4209,7 +4209,7 @@
         },
         "features": {
           "mass": [ 2, 1 ],
-          "scanangle": [ 1, 2 ],
+          "angle": [ 1, 2 ],
           "scantime": [ 1, 0.5 ]
         }
       }
@@ -4227,7 +4227,7 @@
         "features": {
           "integrity": [ -0.15, -0.1 ],
           "mass": [ -0.2, -0.4 ],
-          "scanangle": [ -0.1, -0.05 ]
+          "angle": [ -0.1, -0.05 ]
         }
       },
       "2": {
@@ -4238,7 +4238,7 @@
         "features": {
           "integrity": [ -0.3, -0.2 ],
           "mass": [ -0.3, -0.5 ],
-          "scanangle": [ -0.15, -0.1 ]
+          "angle": [ -0.15, -0.1 ]
         }
       },
       "3": {
@@ -4250,7 +4250,7 @@
         "features": {
           "integrity": [ -0.45, -0.3 ],
           "mass": [ -0.4, -0.6 ],
-          "scanangle": [ -0.2, -0.15 ]
+          "angle": [ -0.2, -0.15 ]
         }
       },
       "4": {
@@ -4262,7 +4262,7 @@
         "features": {
           "integrity": [ -0.6, -0.4 ],
           "mass": [ -0.5, -0.7 ],
-          "scanangle": [ -0.25, -0.2 ]
+          "angle": [ -0.25, -0.2 ]
         }
       },
       "5": {
@@ -4274,7 +4274,7 @@
         "features": {
           "integrity": [ -0.75, -0.5 ],
           "mass": [ -0.6, -0.8 ],
-          "scanangle": [ -0.3, -0.25 ]
+          "angle": [ -0.3, -0.25 ]
         }
       }
     },
@@ -4290,8 +4290,8 @@
         },
         "features": {
           "mass": [ 0.4, 0.2 ],
-          "scanangle": [ -0.2, -0.1 ],
-          "scanrange": [ 0.1, 0.14 ]
+          "angle": [ -0.2, -0.1 ],
+          "range": [ 0.1, 0.14 ]
         }
       },
       "2": {
@@ -4301,8 +4301,8 @@
         },
         "features": {
           "mass": [ 0.8, 0.4 ],
-          "scanangle": [ -0.3, -0.15 ],
-          "scanrange": [ 0.2, 0.3 ]
+          "angle": [ -0.3, -0.15 ],
+          "range": [ 0.2, 0.3 ]
         }
       },
       "3": {
@@ -4313,8 +4313,8 @@
         },
         "features": {
           "mass": [ 1.2, 0.6 ],
-          "scanangle": [ -0.4, -0.2 ],
-          "scanrange": [ 0.3, 0.45 ]
+          "angle": [ -0.4, -0.2 ],
+          "range": [ 0.3, 0.45 ]
         }
       },
       "4": {
@@ -4325,8 +4325,8 @@
         },
         "features": {
           "mass": [ 1.6, 0.8 ],
-          "scanangle": [ -0.5, -0.25 ],
-          "scanrange": [ 0.4, 0.6 ]
+          "angle": [ -0.5, -0.25 ],
+          "range": [ 0.4, 0.6 ]
         }
       },
       "5": {
@@ -4337,8 +4337,8 @@
         },
         "features": {
           "mass": [ 2, 1 ],
-          "scanangle": [ -0.6, -0.3 ],
-          "scanrange": [ 0.5, 0.75 ]
+          "angle": [ -0.6, -0.3 ],
+          "range": [ 0.5, 0.75 ]
         }
       }
     },
@@ -4354,8 +4354,8 @@
         },
         "features": {
           "power": [ 0.2, 0.1 ],
-          "scanangle": [ 0.2, 0.4 ],
-          "scanrange": [ -0.08, -0.05 ]
+          "angle": [ 0.2, 0.4 ],
+          "range": [ -0.08, -0.05 ]
         }
       },
       "2": {
@@ -4365,8 +4365,8 @@
         },
         "features": {
           "power": [ 0.4, 0.2 ],
-          "scanangle": [ 0.4, 0.8 ],
-          "scanrange": [ -0.16, -0.08 ]
+          "angle": [ 0.4, 0.8 ],
+          "range": [ -0.16, -0.08 ]
         }
       },
       "3": {
@@ -4377,8 +4377,8 @@
         },
         "features": {
           "power": [ 0.6, 0.3 ],
-          "scanangle": [ 0.6, 1.2 ],
-          "scanrange": [ -0.24, -0.12 ]
+          "angle": [ 0.6, 1.2 ],
+          "range": [ -0.24, -0.12 ]
         }
       },
       "4": {
@@ -4389,8 +4389,8 @@
         },
         "features": {
           "power": [ 0.8, 0.4 ],
-          "scanangle": [ 0.8, 1.6 ],
-          "scanrange": [ -0.32, -0.16 ]
+          "angle": [ 0.8, 1.6 ],
+          "range": [ -0.32, -0.16 ]
         }
       },
       "5": {
@@ -4401,8 +4401,8 @@
         },
         "features": {
           "power": [ 1, 0.5 ],
-          "scanangle": [ 1, 2 ],
-          "scanrange": [ -0.4, -0.2 ]
+          "angle": [ 1, 2 ],
+          "range": [ -0.4, -0.2 ]
         }
       }
     },
@@ -4483,7 +4483,7 @@
         "features": {
           "mass": [ 0.4, 0.2 ],
           "power": [ 0.2, 0.1 ],
-          "scanrange": [ 0.2, 0.4 ]
+          "range": [ 0.2, 0.4 ]
         }
       },
       "2": {
@@ -4494,7 +4494,7 @@
         "features": {
           "mass": [ 0.8, 0.4 ],
           "power": [ 0.4, 0.2 ],
-          "scanrange": [ 0.4, 0.8 ]
+          "range": [ 0.4, 0.8 ]
         }
       },
       "3": {
@@ -4506,7 +4506,7 @@
         "features": {
           "mass": [ 1.2, 0.6 ],
           "power": [ 0.6, 0.3 ],
-          "scanrange": [ 0.6, 1.2 ]
+          "range": [ 0.6, 1.2 ]
         }
       },
       "4": {
@@ -4518,7 +4518,7 @@
         "features": {
           "mass": [ 1.6, 0.8 ],
           "power": [ 0.8, 0.4 ],
-          "scanrange": [ 0.8, 1.6 ]
+          "range": [ 0.8, 1.6 ]
         }
       },
       "5": {
@@ -4530,7 +4530,7 @@
         "features": {
           "mass": [ 2, 1 ],
           "power": [ 1, 0.5 ],
-          "scanrange": [ 1, 2 ]
+          "range": [ 1, 2 ]
         }
       }
     },
@@ -4547,7 +4547,7 @@
         "features": {
           "mass": [ 0.4, 0.2 ],
           "power": [ 0.2, 0.1 ],
-          "scanangle": [ 0.2, 0.4 ]
+          "angle": [ 0.2, 0.4 ]
         }
       },
       "2": {
@@ -4558,7 +4558,7 @@
         "features": {
           "mass": [ 0.8, 0.4 ],
           "power": [ 0.4, 0.2 ],
-          "scanangle": [ 0.4, 0.8 ]
+          "angle": [ 0.4, 0.8 ]
         }
       },
       "3": {
@@ -4570,7 +4570,7 @@
         "features": {
           "mass": [ 1.2, 0.6 ],
           "power": [ 0.6, 0.3 ],
-          "scanangle": [ 0.6, 1.2 ]
+          "angle": [ 0.6, 1.2 ]
         }
       },
       "4": {
@@ -4582,7 +4582,7 @@
         "features": {
           "mass": [ 1.6, 0.8 ],
           "power": [ 0.8, 0.4 ],
-          "scanangle": [ 0.8, 1.6 ]
+          "angle": [ 0.8, 1.6 ]
         }
       },
       "5": {
@@ -4594,7 +4594,7 @@
         "features": {
           "mass": [ 2, 1 ],
           "power": [ 1, 0.5 ],
-          "scanangle": [ 1, 2 ]
+          "angle": [ 1, 2 ]
         }
       }
     },
@@ -4674,7 +4674,7 @@
         },
         "features": {
           "power": [ 0.2, 0.1 ],
-          "scanangle": [ -0.2, -0.1 ],
+          "angle": [ -0.2, -0.1 ],
           "range": [ 0.1, 0.2 ]
         }
       },
@@ -4685,7 +4685,7 @@
         },
         "features": {
           "power": [ 0.4, 0.2 ],
-          "scanangle": [ -0.3, -0.15 ],
+          "angle": [ -0.3, -0.15 ],
           "range": [ 0.2, 0.4 ]
         }
       },
@@ -4697,7 +4697,7 @@
         },
         "features": {
           "power": [ 0.6, 0.3 ],
-          "scanangle": [ -0.4, -0.2 ],
+          "angle": [ -0.4, -0.2 ],
           "range": [ 0.3, 0.6 ]
         }
       },
@@ -4709,7 +4709,7 @@
         },
         "features": {
           "power": [ 0.8, 0.4 ],
-          "scanangle": [ -0.5, -0.25 ],
+          "angle": [ -0.5, -0.25 ],
           "range": [ 0.4, 0.8 ]
         }
       },
@@ -4721,7 +4721,7 @@
         },
         "features": {
           "power": [ 1, 0.5 ],
-          "scanangle": [ -0.6, -0.3 ],
+          "angle": [ -0.6, -0.3 ],
           "range": [ 0.5, 1 ]
         }
       }
@@ -4738,7 +4738,7 @@
         },
         "features": {
           "mass": [ 0.4, 0.2 ],
-          "scanangle": [ 0.2, 0.4 ],
+          "angle": [ 0.2, 0.4 ],
           "scantime": [ 0.2, 0.1 ]
         }
       },
@@ -4749,7 +4749,7 @@
         },
         "features": {
           "mass": [ 0.8, 0.4 ],
-          "scanangle": [ 0.4, 0.8 ],
+          "angle": [ 0.4, 0.8 ],
           "scantime": [ 0.4, 0.2 ]
         }
       },
@@ -4761,7 +4761,7 @@
         },
         "features": {
           "mass": [ 1.2, 0.6 ],
-          "scanangle": [ 0.6, 1.2 ],
+          "angle": [ 0.6, 1.2 ],
           "scantime": [ 0.6, 0.3 ]
         }
       },
@@ -4773,7 +4773,7 @@
         },
         "features": {
           "mass": [ 1.2, 0.6 ],
-          "scanangle": [ 0.8, 1.6 ],
+          "angle": [ 0.8, 1.6 ],
           "scantime": [ 0.8, 0.4 ]
         }
       },
@@ -4785,7 +4785,7 @@
         },
         "features": {
           "mass": [ 2, 1 ],
-          "scanangle": [ 1, 2 ],
+          "angle": [ 1, 2 ],
           "scantime": [ 1, 0.5 ]
         }
       }
diff --git a/modifications/modifications.json b/modifications/modifications.json
index 771e437..08910f3 100644
--- a/modifications/modifications.json
+++ b/modifications/modifications.json
@@ -34,8 +34,7 @@
     "regen": {"id": 27, "name": "regen", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "reload": {"id": 28, "name": "reload", "type": "percentage", "method": "multiplicative", "higherbetter": false},
     "rof": {"id": 29, "name": "rof", "type": "percentage", "method": "multiplicative", "higherbetter": false},
-    "scanangle": {"id": 46, "name": "scanangle", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "scanrange": {"id": 47, "name": "scanrange", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "angle": {"id": 46, "name": "scanangle", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "scantime": {"id": 48, "name": "scantime", "type": "percentage", "method": "multiplicative", "higherbetter": false},
     "shield": {"id": 30, "name": "shield", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "shieldboost": {"id": 31, "name": "shieldboost", "type": "percentage", "method": "multiplicative", "higherbetter": true},
diff --git a/modifications/modules.json b/modifications/modules.json
index 1bf53cb..acb54df 100644
--- a/modifications/modules.json
+++ b/modifications/modules.json
@@ -157,11 +157,10 @@
       "Sensor_CargoScanner_WideAngle": [1, 2, 3, 4, 5]
     },
     "modifications": [
-      "boot",
       "integrity",
       "mass",
       "power",
-      "scanangle",
+      "angle",
       "range",
       "scantime"
     ]
@@ -339,11 +338,10 @@
       "Sensor_KillWarrantScanner_WideAngle": [1, 2, 3, 4, 5]
     },
     "modifications": [
-      "boot",
       "integrity",
       "mass",
       "power",
-      "scanangle",
+      "angle",
       "range",
       "scantime"
     ]
@@ -714,8 +712,8 @@
       "integrity",
       "mass",
       "power",
-      "scanrange",
-      "scanangle"
+      "range",
+      "angle"
     ]
   },
   "sb": {
@@ -790,8 +788,8 @@
     "modifications": [
       "mass",
       "power",
-      "scanangle",
-      "scanrange",
+      "angle",
+      "range",
       "scantime"
     ]
   },
@@ -881,11 +879,10 @@
       "Sensor_WakeScanner_WideAngle": [1, 2, 3, 4, 5]
     },
     "modifications": [
-      "boot",
       "integrity",
       "mass",
       "power",
-      "scanangle",
+      "angle",
       "range",
       "scantime"
     ]
diff --git a/modules/standard/sensors.json b/modules/standard/sensors.json
index d31b00e..aabba74 100644
--- a/modules/standard/sensors.json
+++ b/modules/standard/sensors.json
@@ -1,6 +1,7 @@
 {
   "s": [
     {
+      "angle": 30,
       "class": 8,
       "cost": 697580,
       "edID": 128064253,
@@ -14,6 +15,7 @@
       "rating": "E"
     },
     {
+      "angle": 30,
       "class": 8,
       "cost": 1743960,
       "edID": 128064254,
@@ -27,6 +29,7 @@
       "rating": "D"
     },
     {
+      "angle": 30,
       "class": 8,
       "cost": 4359900,
       "edID": 128064255,
@@ -40,6 +43,7 @@
       "rating": "C"
     },
     {
+      "angle": 30,
       "class": 8,
       "cost": 10899760,
       "edID": 128064256,
@@ -53,6 +57,7 @@
       "rating": "B"
     },
     {
+      "angle": 30,
       "class": 8,
       "cost": 27249390,
       "edID": 128064257,
@@ -66,6 +71,7 @@
       "rating": "A"
     },
     {
+      "angle": 30,
       "class": 7,
       "cost": 249140,
       "edID": 128064248,
@@ -79,6 +85,7 @@
       "rating": "E"
     },
     {
+      "angle": 30,
       "class": 7,
       "cost": 622840,
       "edID": 128064249,
@@ -92,6 +99,7 @@
       "rating": "D"
     },
     {
+      "angle": 30,
       "class": 7,
       "cost": 1557110,
       "edID": 128064250,
@@ -105,6 +113,7 @@
       "rating": "C"
     },
     {
+      "angle": 30,
       "class": 7,
       "cost": 3892770,
       "edID": 128064251,
@@ -118,6 +127,7 @@
       "rating": "B"
     },
     {
+      "angle": 30,
       "class": 7,
       "cost": 9731930,
       "edID": 128064252,
@@ -131,6 +141,7 @@
       "rating": "A"
     },
     {
+      "angle": 30,
       "class": 6,
       "cost": 88980,
       "edID": 128064243,
@@ -144,6 +155,7 @@
       "rating": "E"
     },
     {
+      "angle": 30,
       "class": 6,
       "cost": 222440,
       "edID": 128064244,
@@ -157,6 +169,7 @@
       "rating": "D"
     },
     {
+      "angle": 30,
       "class": 6,
       "cost": 556110,
       "edID": 128064245,
@@ -170,6 +183,7 @@
       "rating": "C"
     },
     {
+      "angle": 30,
       "class": 6,
       "cost": 1390280,
       "edID": 128064246,
@@ -183,6 +197,7 @@
       "rating": "B"
     },
     {
+      "angle": 30,
       "class": 6,
       "cost": 3475690,
       "edID": 128064247,
@@ -196,6 +211,7 @@
       "rating": "A"
     },
     {
+      "angle": 30,
       "class": 5,
       "cost": 31780,
       "edID": 128064238,
@@ -209,6 +225,7 @@
       "rating": "E"
     },
     {
+      "angle": 30,
       "class": 5,
       "cost": 79440,
       "edID": 128064239,
@@ -222,6 +239,7 @@
       "rating": "D"
     },
     {
+      "angle": 30,
       "class": 5,
       "cost": 198610,
       "edID": 128064240,
@@ -235,6 +253,7 @@
       "rating": "C"
     },
     {
+      "angle": 30,
       "class": 5,
       "cost": 496530,
       "edID": 128064241,
@@ -248,6 +267,7 @@
       "rating": "B"
     },
     {
+      "angle": 30,
       "class": 5,
       "cost": 1241320,
       "edID": 128064242,
@@ -261,6 +281,7 @@
       "rating": "A"
     },
     {
+      "angle": 30,
       "class": 4,
       "cost": 11350,
       "edID": 128064233,
@@ -274,6 +295,7 @@
       "rating": "E"
     },
     {
+      "angle": 30,
       "class": 4,
       "cost": 28370,
       "edID": 128064234,
@@ -287,6 +309,7 @@
       "rating": "D"
     },
     {
+      "angle": 30,
       "class": 4,
       "cost": 70930,
       "edID": 128064235,
@@ -300,6 +323,7 @@
       "rating": "C"
     },
     {
+      "angle": 30,
       "class": 4,
       "cost": 177330,
       "edID": 128064236,
@@ -313,6 +337,7 @@
       "rating": "B"
     },
     {
+      "angle": 30,
       "class": 4,
       "cost": 443330,
       "edID": 128064237,
@@ -326,6 +351,7 @@
       "rating": "A"
     },
     {
+      "angle": 30,
       "class": 3,
       "cost": 4050,
       "edID": 128064228,
@@ -339,6 +365,7 @@
       "rating": "E"
     },
     {
+      "angle": 30,
       "class": 3,
       "cost": 10130,
       "edID": 128064229,
@@ -352,6 +379,7 @@
       "rating": "D"
     },
     {
+      "angle": 30,
       "class": 3,
       "cost": 25330,
       "edID": 128064230,
@@ -365,6 +393,7 @@
       "rating": "C"
     },
     {
+      "angle": 30,
       "class": 3,
       "cost": 63330,
       "edID": 128064231,
@@ -378,6 +407,7 @@
       "rating": "B"
     },
     {
+      "angle": 30,
       "class": 3,
       "cost": 158330,
       "edID": 128064232,
@@ -391,6 +421,7 @@
       "rating": "A"
     },
     {
+      "angle": 30,
       "class": 2,
       "cost": 1450,
       "edID": 128064223,
@@ -404,6 +435,7 @@
       "rating": "E"
     },
     {
+      "angle": 30,
       "class": 2,
       "cost": 3620,
       "edID": 128064224,
@@ -417,6 +449,7 @@
       "rating": "D"
     },
     {
+      "angle": 30,
       "class": 2,
       "cost": 9050,
       "edID": 128064225,
@@ -430,6 +463,7 @@
       "rating": "C"
     },
     {
+      "angle": 30,
       "class": 2,
       "cost": 22620,
       "edID": 128064226,
@@ -443,6 +477,7 @@
       "rating": "B"
     },
     {
+      "angle": 30,
       "class": 2,
       "cost": 56550,
       "edID": 128064227,
@@ -456,6 +491,7 @@
       "rating": "A"
     },
     {
+      "angle": 30,
       "class": 1,
       "cost": 520,
       "edID": 128064218,
@@ -469,6 +505,7 @@
       "rating": "E"
     },
     {
+      "angle": 30,
       "class": 1,
       "cost": 1290,
       "edID": 128064219,
@@ -482,6 +519,7 @@
       "rating": "D"
     },
     {
+      "angle": 30,
       "class": 1,
       "cost": 3230,
       "edID": 128064220,
@@ -495,6 +533,7 @@
       "rating": "C"
     },
     {
+      "angle": 30,
       "class": 1,
       "cost": 8080,
       "edID": 128064221,
@@ -508,6 +547,7 @@
       "rating": "B"
     },
     {
+      "angle": 30,
       "class": 1,
       "cost": 20200,
       "edID": 128064222,