diff --git a/.txt b/.txt
index 5ed928f..262e41c 100644
--- a/.txt
+++ b/.txt
@@ -2,25 +2,25 @@
 		--==[ Path Profile Analysis ]==--
 
 Transmitter site: Tx
-Site location: 52.1947 North / 2.0959 West
+Site location: 51.8648 North / 2.2022 West
 Ground elevation: 0.00 meters AMSL
-Antenna height: 30.00 meters AGL / 30.00 meters AMSL
-Distance to Rx: 19.89 kilometers
-Azimuth to Rx: 89.69 degrees
-Depression angle to Rx: -0.1701 degrees
+Antenna height: 36.00 meters AGL / 36.00 meters AMSL
+Distance to Rx: 1.00 kilometers
+Azimuth to Rx: 91.27 degrees
+Depression angle to Rx: -1.5004 degrees
 Receiver site: Rx
-Site location: 52.1953 North / 1.8041 West
+Site location: 51.8646 North / 2.1877 West
 Ground elevation: 0.00 meters AMSL
-Antenna height: 2.00 meters AGL / 2.00 meters AMSL
-Distance to Tx: 19.89 kilometers
-Azimuth to Tx: 269.92 degrees
-Depression angle to Tx: -0.0088 degrees
+Antenna height: 10.00 meters AGL / 10.00 meters AMSL
+Distance to Tx: 1.00 kilometers
+Azimuth to Tx: 271.29 degrees
+Elevation angle to Tx: +1.4914 degrees
 Longley-Rice path calculation parameters used in this analysis:
 
 Earth's Dielectric Constant: 15.000
 Earth's Conductivity: 0.005 Siemens/meter
 Atmospheric Bending Constant (N-units): 301.000 ppm
-Frequency: 800.000 MHz
+Frequency: 900.000 MHz
 Radio Climate: 5 (Continental Temperate)
 Polarisation: 1 (Vertical)
 Fraction of Situations: 50.0%
@@ -30,9 +30,9 @@ Fraction of Time: 50.0%
 
 Summary for the link between Tx and Rx:
 
-Free space path loss: 116.50 dB
-Longley-Rice path loss: 170.10 dB
-Attenuation due to terrain shielding: 53.60 dB
+Free space path loss: 91.52 dB
+Longley-Rice path loss: 92.83 dB
+Attenuation due to terrain shielding: 1.32 dB
 Mode of propagation: 
 Longley-Rice model error number: 0 (No error)
 
@@ -41,8 +41,6 @@ Longley-Rice model error number: 0 (No error)
 
 No obstructions to LOS path due to terrain were detected
 
-Antenna at Rx must be raised to at least 83.99 meters AGL
-to clear the first Fresnel zone.
+The first Fresnel zone is clear.
 
-Antenna at Rx must be raised to at least 37.97 meters AGL
-to clear 60% of the first Fresnel zone.
+60% of the first Fresnel zone is clear.
diff --git a/CHANGELOG b/CHANGELOG
index e1beb66..6ca0927 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
 SIGNAL SERVER CHANGE LOG 
 
+2.43 - 06 Mar 2015
+Improved model error handling
+Tweaked params for Ericsson model and inverted environment variables to match rest
+
 v2.41 - 27 February 2015
 Simpler PPA output for scripting
 Enabled new models for PPA (previously just ITM)
diff --git a/_curvature b/_curvature
index 10238b0..b151541 100644
--- a/_curvature
+++ b/_curvature
@@ -1,351 +1,18 @@
-0.000 -2.000
-0.057 -1.992
-0.114 -1.984
-0.170 -1.976
-0.227 -1.969
-0.284 -1.963
-0.341 -1.957
-0.398 -1.951
-0.454 -1.947
-0.511 -1.942
-0.568 -1.938
-0.625 -1.935
-0.682 -1.932
-0.738 -1.930
-0.795 -1.928
-0.852 -1.926
-0.909 -1.926
-0.966 -1.925
-1.022 -1.925
-1.079 -1.926
-1.136 -1.927
-1.193 -1.929
-1.250 -1.931
-1.306 -1.934
-1.363 -1.937
-1.420 -1.941
-1.477 -1.945
-1.534 -1.950
-1.590 -1.955
-1.647 -1.960
-1.704 -1.967
-1.761 -1.973
-1.818 -1.981
-1.875 -1.988
-1.931 -1.997
-1.988 -2.005
-2.045 -2.015
-2.102 -2.025
-2.159 -2.035
-2.215 -2.046
-2.272 -2.057
-2.329 -2.069
-2.386 -2.081
-2.443 -2.094
-2.499 -2.107
-2.556 -2.121
-2.613 -2.135
-2.670 -2.150
-2.727 -2.165
-2.783 -2.181
-2.840 -2.198
-2.897 -2.215
-2.954 -2.232
-3.011 -2.250
-3.067 -2.268
-3.124 -2.287
-3.181 -2.307
-3.238 -2.326
-3.295 -2.347
-3.351 -2.368
-3.408 -2.389
-3.465 -2.411
-3.522 -2.434
-3.579 -2.457
-3.635 -2.480
-3.692 -2.504
-3.749 -2.528
-3.806 -2.553
-3.863 -2.579
-3.919 -2.605
-3.976 -2.631
-4.033 -2.658
-4.090 -2.686
-4.147 -2.714
-4.203 -2.742
-4.260 -2.771
-4.317 -2.801
-4.374 -2.831
-4.431 -2.861
-4.487 -2.893
-4.544 -2.924
-4.601 -2.956
-4.658 -2.989
-4.715 -3.022
-4.771 -3.055
-4.828 -3.089
-4.885 -3.124
-4.942 -3.159
-4.999 -3.195
-5.056 -3.231
-5.112 -3.267
-5.169 -3.305
-5.226 -3.342
-5.283 -3.380
-5.340 -3.419
-5.396 -3.458
-5.453 -3.498
-5.510 -3.538
-5.567 -3.579
-5.624 -3.620
-5.680 -3.662
-5.737 -3.704
-5.794 -3.746
-5.851 -3.790
-5.908 -3.833
-5.964 -3.878
-6.021 -3.922
-6.078 -3.968
-6.135 -4.013
-6.192 -4.060
-6.248 -4.106
-6.305 -4.154
-6.362 -4.201
-6.419 -4.250
-6.476 -4.298
-6.532 -4.348
-6.589 -4.397
-6.646 -4.448
-6.703 -4.498
-6.760 -4.550
-6.816 -4.602
-6.873 -4.654
-6.930 -4.707
-6.987 -4.760
-7.044 -4.814
-7.100 -4.868
-7.157 -4.923
-7.214 -4.978
-7.271 -5.034
-7.328 -5.091
-7.384 -5.148
-7.441 -5.205
-7.498 -5.263
-7.555 -5.321
-7.612 -5.380
-7.668 -5.440
-7.725 -5.500
-7.782 -5.560
-7.839 -5.621
-7.896 -5.682
-7.952 -5.744
-8.009 -5.807
-8.066 -5.870
-8.123 -5.933
-8.180 -5.997
-8.237 -6.062
-8.293 -6.127
-8.350 -6.192
-8.407 -6.258
-8.464 -6.325
-8.521 -6.392
-8.577 -6.459
-8.634 -6.527
-8.691 -6.596
-8.748 -6.665
-8.805 -6.734
-8.861 -6.804
-8.918 -6.875
-8.975 -6.946
-9.032 -7.017
-9.089 -7.089
-9.145 -7.162
-9.202 -7.235
-9.259 -7.309
-9.316 -7.383
-9.373 -7.457
-9.429 -7.533
-9.486 -7.608
-9.543 -7.684
-9.600 -7.761
-9.657 -7.838
-9.713 -7.916
-9.770 -7.994
-9.827 -8.073
-9.884 -8.152
-9.941 -8.231
-9.997 -8.312
-10.054 -8.392
-10.111 -8.473
-10.168 -8.555
-10.225 -8.637
-10.281 -8.720
-10.338 -8.803
-10.395 -8.887
-10.452 -8.971
-10.509 -9.056
-10.565 -9.141
-10.622 -9.227
-10.679 -9.313
-10.736 -9.400
-10.793 -9.487
-10.849 -9.575
-10.906 -9.663
-10.963 -9.752
-11.020 -9.841
-11.077 -9.931
-11.133 -10.021
-11.190 -10.112
-11.247 -10.204
-11.304 -10.295
-11.361 -10.388
-11.417 -10.481
-11.474 -10.574
-11.531 -10.668
-11.588 -10.762
-11.645 -10.857
-11.702 -10.952
-11.758 -11.048
-11.815 -11.145
-11.872 -11.241
-11.929 -11.339
-11.986 -11.437
-12.042 -11.535
-12.099 -11.634
-12.156 -11.734
-12.213 -11.833
-12.270 -11.934
-12.326 -12.035
-12.383 -12.136
-12.440 -12.238
-12.497 -12.341
-12.554 -12.444
-12.610 -12.547
-12.667 -12.651
-12.724 -12.756
-12.781 -12.861
-12.838 -12.966
-12.894 -13.072
-12.951 -13.179
-13.008 -13.286
-13.065 -13.393
-13.122 -13.501
-13.178 -13.610
-13.235 -13.719
-13.292 -13.828
-13.349 -13.938
-13.406 -14.049
-13.462 -14.160
-13.519 -14.272
-13.576 -14.384
-13.633 -14.496
-13.690 -14.609
-13.746 -14.723
-13.803 -14.837
-13.860 -14.952
-13.917 -15.067
-13.974 -15.182
-14.030 -15.299
-14.087 -15.415
-14.144 -15.532
-14.201 -15.650
-14.258 -15.768
-14.314 -15.887
-14.371 -16.006
-14.428 -16.126
-14.485 -16.246
-14.542 -16.367
-14.598 -16.488
-14.655 -16.609
-14.712 -16.732
-14.769 -16.854
-14.826 -16.978
-14.883 -17.101
-14.939 -17.226
-14.996 -17.350
-15.053 -17.476
-15.110 -17.601
-15.167 -17.728
-15.223 -17.854
-15.280 -17.982
-15.337 -18.109
-15.394 -18.238
-15.451 -18.367
-15.507 -18.496
-15.564 -18.626
-15.621 -18.756
-15.678 -18.887
-15.735 -19.018
-15.791 -19.150
-15.848 -19.282
-15.905 -19.415
-15.962 -19.548
-16.019 -19.682
-16.075 -19.817
-16.132 -19.952
-16.189 -20.087
-16.246 -20.223
-16.303 -20.359
-16.359 -20.496
-16.416 -20.634
-16.473 -20.771
-16.530 -20.910
-16.587 -21.049
-16.643 -21.188
-16.700 -21.328
-16.757 -21.469
-16.814 -21.610
-16.871 -21.751
-16.927 -21.893
-16.984 -22.035
-17.041 -22.178
-17.098 -22.322
-17.155 -22.466
-17.211 -22.610
-17.268 -22.755
-17.325 -22.901
-17.382 -23.047
-17.439 -23.193
-17.495 -23.340
-17.552 -23.488
-17.609 -23.636
-17.666 -23.785
-17.723 -23.934
-17.779 -24.083
-17.836 -24.233
-17.893 -24.384
-17.950 -24.535
-18.007 -24.687
-18.064 -24.839
-18.120 -24.991
-18.177 -25.144
-18.234 -25.298
-18.291 -25.452
-18.348 -25.607
-18.404 -25.762
-18.461 -25.917
-18.518 -26.074
-18.575 -26.230
-18.632 -26.387
-18.688 -26.545
-18.745 -26.703
-18.802 -26.862
-18.859 -27.021
-18.916 -27.181
-18.972 -27.341
-19.029 -27.502
-19.086 -27.663
-19.143 -27.825
-19.200 -27.987
-19.256 -28.150
-19.313 -28.313
-19.370 -28.477
-19.427 -28.641
-19.484 -28.806
-19.540 -28.971
-19.597 -29.137
-19.654 -29.303
-19.711 -29.470
-19.768 -29.637
-19.824 -29.805
-19.881 -29.973
+0.000 -10.000
+0.057 -11.490
+0.114 -12.981
+0.172 -14.473
+0.229 -15.965
+0.286 -17.457
+0.343 -18.950
+0.401 -20.444
+0.458 -21.938
+0.515 -23.432
+0.572 -24.927
+0.630 -26.423
+0.687 -27.919
+0.744 -29.415
+0.801 -30.913
+0.858 -32.410
+0.916 -33.908
+0.973 -35.407
diff --git a/_fresnel b/_fresnel
index dec6472..46dcfaa 100644
--- a/_fresnel
+++ b/_fresnel
@@ -1,352 +1,19 @@
 0.000 -0.000
-0.057 -4.609
-0.114 -6.508
-0.170 -7.960
-0.227 -9.178
-0.284 -10.246
-0.341 -11.208
-0.398 -12.088
-0.454 -12.904
-0.511 -13.667
-0.568 -14.385
-0.625 -15.065
-0.682 -15.712
-0.738 -16.329
-0.795 -16.920
-0.852 -17.488
-0.909 -18.035
-0.966 -18.562
-1.022 -19.071
-1.079 -19.564
-1.136 -20.042
-1.193 -20.506
-1.250 -20.957
-1.306 -21.395
-1.363 -21.822
-1.420 -22.238
-1.477 -22.643
-1.534 -23.039
-1.590 -23.425
-1.647 -23.803
-1.704 -24.172
-1.761 -24.533
-1.818 -24.887
-1.875 -25.233
-1.931 -25.572
-1.988 -25.904
-2.045 -26.230
-2.102 -26.549
-2.159 -26.863
-2.215 -27.170
-2.272 -27.472
-2.329 -27.769
-2.386 -28.060
-2.443 -28.346
-2.499 -28.627
-2.556 -28.903
-2.613 -29.174
-2.670 -29.441
-2.727 -29.704
-2.783 -29.962
-2.840 -30.216
-2.897 -30.465
-2.954 -30.711
-3.011 -30.953
-3.067 -31.191
-3.124 -31.425
-3.181 -31.656
-3.238 -31.883
-3.295 -32.107
-3.351 -32.327
-3.408 -32.543
-3.465 -32.757
-3.522 -32.967
-3.579 -33.174
-3.635 -33.378
-3.692 -33.579
-3.749 -33.777
-3.806 -33.972
-3.863 -34.164
-3.919 -34.353
-3.976 -34.540
-4.033 -34.724
-4.090 -34.905
-4.147 -35.083
-4.203 -35.259
-4.260 -35.432
-4.317 -35.602
-4.374 -35.770
-4.431 -35.936
-4.487 -36.099
-4.544 -36.260
-4.601 -36.418
-4.658 -36.574
-4.715 -36.728
-4.771 -36.879
-4.828 -37.028
-4.885 -37.175
-4.942 -37.320
-4.999 -37.462
-5.056 -37.603
-5.112 -37.741
-5.169 -37.877
-5.226 -38.011
-5.283 -38.143
-5.340 -38.273
-5.396 -38.401
-5.453 -38.526
-5.510 -38.650
-5.567 -38.772
-5.624 -38.892
-5.680 -39.010
-5.737 -39.126
-5.794 -39.241
-5.851 -39.353
-5.908 -39.463
-5.964 -39.572
-6.021 -39.679
-6.078 -39.784
-6.135 -39.887
-6.192 -39.989
-6.248 -40.088
-6.305 -40.186
-6.362 -40.282
-6.419 -40.377
-6.476 -40.469
-6.532 -40.560
-6.589 -40.649
-6.646 -40.737
-6.703 -40.823
-6.760 -40.907
-6.816 -40.990
-6.873 -41.071
-6.930 -41.150
-6.987 -41.228
-7.044 -41.304
-7.100 -41.378
-7.157 -41.451
-7.214 -41.522
-7.271 -41.592
-7.328 -41.660
-7.384 -41.726
-7.441 -41.791
-7.498 -41.855
-7.555 -41.917
-7.612 -41.977
-7.668 -42.036
-7.725 -42.093
-7.782 -42.149
-7.839 -42.203
-7.896 -42.255
-7.952 -42.307
-8.009 -42.356
-8.066 -42.405
-8.123 -42.451
-8.180 -42.497
-8.237 -42.540
-8.293 -42.583
-8.350 -42.623
-8.407 -42.663
-8.464 -42.701
-8.521 -42.737
-8.577 -42.772
-8.634 -42.806
-8.691 -42.838
-8.748 -42.868
-8.805 -42.897
-8.861 -42.925
-8.918 -42.951
-8.975 -42.976
-9.032 -43.000
-9.089 -43.022
-9.145 -43.043
-9.202 -43.062
-9.259 -43.079
-9.316 -43.096
-9.373 -43.111
-9.429 -43.124
-9.486 -43.136
-9.543 -43.147
-9.600 -43.156
-9.657 -43.164
-9.713 -43.171
-9.770 -43.176
-9.827 -43.179
-9.884 -43.182
-9.941 -43.182
-9.997 -43.182
-10.054 -43.180
-10.111 -43.176
-10.168 -43.172
-10.225 -43.165
-10.281 -43.158
-10.338 -43.149
-10.395 -43.138
-10.452 -43.126
-10.509 -43.113
-10.565 -43.098
-10.622 -43.082
-10.679 -43.065
-10.736 -43.046
-10.793 -43.025
-10.849 -43.003
-10.906 -42.980
-10.963 -42.956
-11.020 -42.930
-11.077 -42.902
-11.133 -42.873
-11.190 -42.843
-11.247 -42.811
-11.304 -42.777
-11.361 -42.743
-11.417 -42.707
-11.474 -42.669
-11.531 -42.630
-11.588 -42.589
-11.645 -42.547
-11.702 -42.504
-11.758 -42.459
-11.815 -42.412
-11.872 -42.364
-11.929 -42.315
-11.986 -42.264
-12.042 -42.211
-12.099 -42.157
-12.156 -42.102
-12.213 -42.045
-12.270 -41.986
-12.326 -41.926
-12.383 -41.865
-12.440 -41.802
-12.497 -41.737
-12.554 -41.671
-12.610 -41.603
-12.667 -41.533
-12.724 -41.462
-12.781 -41.390
-12.838 -41.316
-12.894 -41.240
-12.951 -41.163
-13.008 -41.084
-13.065 -41.003
-13.122 -40.921
-13.178 -40.837
-13.235 -40.751
-13.292 -40.664
-13.349 -40.575
-13.406 -40.484
-13.462 -40.392
-13.519 -40.298
-13.576 -40.202
-13.633 -40.104
-13.690 -40.005
-13.746 -39.904
-13.803 -39.801
-13.860 -39.696
-13.917 -39.589
-13.974 -39.481
-14.030 -39.371
-14.087 -39.259
-14.144 -39.145
-14.201 -39.029
-14.258 -38.911
-14.314 -38.792
-14.371 -38.670
-14.428 -38.547
-14.485 -38.421
-14.542 -38.293
-14.598 -38.164
-14.655 -38.032
-14.712 -37.899
-14.769 -37.763
-14.826 -37.625
-14.883 -37.485
-14.939 -37.343
-14.996 -37.199
-15.053 -37.052
-15.110 -36.903
-15.167 -36.752
-15.223 -36.599
-15.280 -36.443
-15.337 -36.285
-15.394 -36.125
-15.451 -35.962
-15.507 -35.797
-15.564 -35.630
-15.621 -35.459
-15.678 -35.287
-15.735 -35.111
-15.791 -34.934
-15.848 -34.753
-15.905 -34.570
-15.962 -34.384
-16.019 -34.195
-16.075 -34.003
-16.132 -33.809
-16.189 -33.611
-16.246 -33.411
-16.303 -33.207
-16.359 -33.001
-16.416 -32.791
-16.473 -32.578
-16.530 -32.362
-16.587 -32.142
-16.643 -31.919
-16.700 -31.693
-16.757 -31.463
-16.814 -31.229
-16.871 -30.992
-16.927 -30.750
-16.984 -30.505
-17.041 -30.256
-17.098 -30.003
-17.155 -29.745
-17.211 -29.484
-17.268 -29.218
-17.325 -28.947
-17.382 -28.671
-17.439 -28.391
-17.495 -28.106
-17.552 -27.816
-17.609 -27.520
-17.666 -27.219
-17.723 -26.913
-17.779 -26.600
-17.836 -26.282
-17.893 -25.957
-17.950 -25.626
-18.007 -25.288
-18.064 -24.943
-18.120 -24.591
-18.177 -24.231
-18.234 -23.863
-18.291 -23.487
-18.348 -23.102
-18.404 -22.707
-18.461 -22.304
-18.518 -21.889
-18.575 -21.465
-18.632 -21.028
-18.688 -20.580
-18.745 -20.118
-18.802 -19.642
-18.859 -19.152
-18.916 -18.645
-18.972 -18.121
-19.029 -17.577
-19.086 -17.013
-19.143 -16.426
-19.200 -15.813
-19.256 -15.171
-19.313 -14.497
-19.370 -13.785
-19.427 -13.030
-19.484 -12.224
-19.540 -11.355
-19.597 -10.408
-19.654 -9.359
-19.711 -8.169
-19.768 -6.764
-19.824 -4.965
-19.881 -1.852
-19.890 0.000
\ No newline at end of file
+0.057 -4.240
+0.114 -5.811
+0.172 -6.882
+0.229 -7.666
+0.286 -8.245
+0.343 -8.660
+0.401 -8.934
+0.458 -9.081
+0.515 -9.105
+0.572 -9.008
+0.630 -8.786
+0.687 -8.430
+0.744 -7.920
+0.801 -7.226
+0.858 -6.284
+0.916 -4.959
+0.973 -2.736
+0.996 0.000
\ No newline at end of file
diff --git a/_fresnel60 b/_fresnel60
index 46862e3..5dd24c0 100644
--- a/_fresnel60
+++ b/_fresnel60
@@ -1,352 +1,19 @@
 0.000 -0.000
-0.057 -2.765
-0.114 -3.905
-0.170 -4.776
-0.227 -5.507
-0.284 -6.148
-0.341 -6.725
-0.398 -7.253
-0.454 -7.742
-0.511 -8.200
-0.568 -8.631
-0.625 -9.039
-0.682 -9.427
-0.738 -9.797
-0.795 -10.152
-0.852 -10.493
-0.909 -10.821
-0.966 -11.137
-1.022 -11.443
-1.079 -11.739
-1.136 -12.025
-1.193 -12.304
-1.250 -12.574
-1.306 -12.837
-1.363 -13.093
-1.420 -13.343
-1.477 -13.586
-1.534 -13.823
-1.590 -14.055
-1.647 -14.282
-1.704 -14.503
-1.761 -14.720
-1.818 -14.932
-1.875 -15.140
-1.931 -15.343
-1.988 -15.542
-2.045 -15.738
-2.102 -15.930
-2.159 -16.118
-2.215 -16.302
-2.272 -16.483
-2.329 -16.661
-2.386 -16.836
-2.443 -17.007
-2.499 -17.176
-2.556 -17.342
-2.613 -17.505
-2.670 -17.665
-2.727 -17.822
-2.783 -17.977
-2.840 -18.129
-2.897 -18.279
-2.954 -18.427
-3.011 -18.572
-3.067 -18.715
-3.124 -18.855
-3.181 -18.994
-3.238 -19.130
-3.295 -19.264
-3.351 -19.396
-3.408 -19.526
-3.465 -19.654
-3.522 -19.780
-3.579 -19.905
-3.635 -20.027
-3.692 -20.148
-3.749 -20.266
-3.806 -20.383
-3.863 -20.499
-3.919 -20.612
-3.976 -20.724
-4.033 -20.834
-4.090 -20.943
-4.147 -21.050
-4.203 -21.155
-4.260 -21.259
-4.317 -21.361
-4.374 -21.462
-4.431 -21.562
-4.487 -21.659
-4.544 -21.756
-4.601 -21.851
-4.658 -21.944
-4.715 -22.037
-4.771 -22.127
-4.828 -22.217
-4.885 -22.305
-4.942 -22.392
-4.999 -22.477
-5.056 -22.562
-5.112 -22.644
-5.169 -22.726
-5.226 -22.807
-5.283 -22.886
-5.340 -22.964
-5.396 -23.040
-5.453 -23.116
-5.510 -23.190
-5.567 -23.263
-5.624 -23.335
-5.680 -23.406
-5.737 -23.476
-5.794 -23.544
-5.851 -23.612
-5.908 -23.678
-5.964 -23.743
-6.021 -23.807
-6.078 -23.870
-6.135 -23.932
-6.192 -23.993
-6.248 -24.053
-6.305 -24.112
-6.362 -24.169
-6.419 -24.226
-6.476 -24.282
-6.532 -24.336
-6.589 -24.390
-6.646 -24.442
-6.703 -24.494
-6.760 -24.544
-6.816 -24.594
-6.873 -24.642
-6.930 -24.690
-6.987 -24.737
-7.044 -24.782
-7.100 -24.827
-7.157 -24.871
-7.214 -24.913
-7.271 -24.955
-7.328 -24.996
-7.384 -25.036
-7.441 -25.075
-7.498 -25.113
-7.555 -25.150
-7.612 -25.186
-7.668 -25.221
-7.725 -25.256
-7.782 -25.289
-7.839 -25.322
-7.896 -25.353
-7.952 -25.384
-8.009 -25.414
-8.066 -25.443
-8.123 -25.471
-8.180 -25.498
-8.237 -25.524
-8.293 -25.550
-8.350 -25.574
-8.407 -25.598
-8.464 -25.620
-8.521 -25.642
-8.577 -25.663
-8.634 -25.683
-8.691 -25.703
-8.748 -25.721
-8.805 -25.738
-8.861 -25.755
-8.918 -25.771
-8.975 -25.786
-9.032 -25.800
-9.089 -25.813
-9.145 -25.826
-9.202 -25.837
-9.259 -25.848
-9.316 -25.857
-9.373 -25.866
-9.429 -25.875
-9.486 -25.882
-9.543 -25.888
-9.600 -25.894
-9.657 -25.899
-9.713 -25.902
-9.770 -25.905
-9.827 -25.908
-9.884 -25.909
-9.941 -25.909
-9.997 -25.909
-10.054 -25.908
-10.111 -25.906
-10.168 -25.903
-10.225 -25.899
-10.281 -25.895
-10.338 -25.889
-10.395 -25.883
-10.452 -25.876
-10.509 -25.868
-10.565 -25.859
-10.622 -25.849
-10.679 -25.839
-10.736 -25.827
-10.793 -25.815
-10.849 -25.802
-10.906 -25.788
-10.963 -25.773
-11.020 -25.758
-11.077 -25.741
-11.133 -25.724
-11.190 -25.706
-11.247 -25.686
-11.304 -25.666
-11.361 -25.646
-11.417 -25.624
-11.474 -25.601
-11.531 -25.578
-11.588 -25.554
-11.645 -25.528
-11.702 -25.502
-11.758 -25.475
-11.815 -25.447
-11.872 -25.419
-11.929 -25.389
-11.986 -25.358
-12.042 -25.327
-12.099 -25.294
-12.156 -25.261
-12.213 -25.227
-12.270 -25.192
-12.326 -25.156
-12.383 -25.119
-12.440 -25.081
-12.497 -25.042
-12.554 -25.002
-12.610 -24.962
-12.667 -24.920
-12.724 -24.877
-12.781 -24.834
-12.838 -24.789
-12.894 -24.744
-12.951 -24.698
-13.008 -24.650
-13.065 -24.602
-13.122 -24.552
-13.178 -24.502
-13.235 -24.451
-13.292 -24.398
-13.349 -24.345
-13.406 -24.290
-13.462 -24.235
-13.519 -24.179
-13.576 -24.121
-13.633 -24.062
-13.690 -24.003
-13.746 -23.942
-13.803 -23.880
-13.860 -23.818
-13.917 -23.754
-13.974 -23.689
-14.030 -23.623
-14.087 -23.555
-14.144 -23.487
-14.201 -23.417
-14.258 -23.347
-14.314 -23.275
-14.371 -23.202
-14.428 -23.128
-14.485 -23.053
-14.542 -22.976
-14.598 -22.898
-14.655 -22.819
-14.712 -22.739
-14.769 -22.658
-14.826 -22.575
-14.883 -22.491
-14.939 -22.406
-14.996 -22.319
-15.053 -22.231
-15.110 -22.142
-15.167 -22.051
-15.223 -21.959
-15.280 -21.866
-15.337 -21.771
-15.394 -21.675
-15.451 -21.577
-15.507 -21.478
-15.564 -21.378
-15.621 -21.276
-15.678 -21.172
-15.735 -21.067
-15.791 -20.960
-15.848 -20.852
-15.905 -20.742
-15.962 -20.630
-16.019 -20.517
-16.075 -20.402
-16.132 -20.285
-16.189 -20.167
-16.246 -20.047
-16.303 -19.924
-16.359 -19.800
-16.416 -19.675
-16.473 -19.547
-16.530 -19.417
-16.587 -19.285
-16.643 -19.152
-16.700 -19.016
-16.757 -18.878
-16.814 -18.737
-16.871 -18.595
-16.927 -18.450
-16.984 -18.303
-17.041 -18.154
-17.098 -18.002
-17.155 -17.847
-17.211 -17.690
-17.268 -17.531
-17.325 -17.368
-17.382 -17.203
-17.439 -17.035
-17.495 -16.864
-17.552 -16.689
-17.609 -16.512
-17.666 -16.332
-17.723 -16.148
-17.779 -15.960
-17.836 -15.769
-17.893 -15.574
-17.950 -15.375
-18.007 -15.173
-18.064 -14.966
-18.120 -14.754
-18.177 -14.538
-18.234 -14.318
-18.291 -14.092
-18.348 -13.861
-18.404 -13.624
-18.461 -13.382
-18.518 -13.134
-18.575 -12.879
-18.632 -12.617
-18.688 -12.348
-18.745 -12.071
-18.802 -11.785
-18.859 -11.491
-18.916 -11.187
-18.972 -10.872
-19.029 -10.546
-19.086 -10.208
-19.143 -9.856
-19.200 -9.488
-19.256 -9.103
-19.313 -8.698
-19.370 -8.271
-19.427 -7.818
-19.484 -7.334
-19.540 -6.813
-19.597 -6.245
-19.654 -5.615
-19.711 -4.901
-19.768 -4.058
-19.824 -2.979
-19.881 -1.111
-19.890 0.000
\ No newline at end of file
+0.057 -2.544
+0.114 -3.487
+0.172 -4.129
+0.229 -4.600
+0.286 -4.947
+0.343 -5.196
+0.401 -5.361
+0.458 -5.448
+0.515 -5.463
+0.572 -5.405
+0.630 -5.272
+0.687 -5.058
+0.744 -4.752
+0.801 -4.335
+0.858 -3.771
+0.916 -2.975
+0.973 -1.642
+0.996 0.000
\ No newline at end of file
diff --git a/_profile b/_profile
index caa8840..ecf8cdc 100644
--- a/_profile
+++ b/_profile
@@ -1 +1 @@
-19.890 0.000
\ No newline at end of file
+0.996 0.000
\ No newline at end of file
diff --git a/_reference b/_reference
index e7a13e5..9480292 100644
--- a/_reference
+++ b/_reference
@@ -1,352 +1,19 @@
 0.000 0.000
 0.057 0.000
 0.114 0.000
-0.170 0.000
-0.227 0.000
-0.284 0.000
-0.341 0.000
-0.398 0.000
-0.454 0.000
-0.511 0.000
-0.568 0.000
-0.625 0.000
-0.682 0.000
-0.738 0.000
-0.795 0.000
-0.852 0.000
-0.909 0.000
-0.966 0.000
-1.022 0.000
-1.079 0.000
-1.136 0.000
-1.193 0.000
-1.250 0.000
-1.306 0.000
-1.363 0.000
-1.420 0.000
-1.477 0.000
-1.534 0.000
-1.590 0.000
-1.647 0.000
-1.704 0.000
-1.761 0.000
-1.818 0.000
-1.875 0.000
-1.931 0.000
-1.988 0.000
-2.045 0.000
-2.102 0.000
-2.159 0.000
-2.215 0.000
-2.272 0.000
-2.329 0.000
-2.386 0.000
-2.443 0.000
-2.499 0.000
-2.556 0.000
-2.613 0.000
-2.670 0.000
-2.727 0.000
-2.783 0.000
-2.840 0.000
-2.897 0.000
-2.954 0.000
-3.011 0.000
-3.067 0.000
-3.124 0.000
-3.181 0.000
-3.238 0.000
-3.295 0.000
-3.351 0.000
-3.408 0.000
-3.465 0.000
-3.522 0.000
-3.579 0.000
-3.635 0.000
-3.692 0.000
-3.749 0.000
-3.806 0.000
-3.863 0.000
-3.919 0.000
-3.976 0.000
-4.033 0.000
-4.090 0.000
-4.147 0.000
-4.203 0.000
-4.260 0.000
-4.317 0.000
-4.374 0.000
-4.431 0.000
-4.487 0.000
-4.544 0.000
-4.601 0.000
-4.658 0.000
-4.715 0.000
-4.771 0.000
-4.828 0.000
-4.885 0.000
-4.942 0.000
-4.999 0.000
-5.056 0.000
-5.112 0.000
-5.169 0.000
-5.226 0.000
-5.283 0.000
-5.340 0.000
-5.396 0.000
-5.453 0.000
-5.510 0.000
-5.567 0.000
-5.624 0.000
-5.680 0.000
-5.737 0.000
-5.794 0.000
-5.851 0.000
-5.908 0.000
-5.964 0.000
-6.021 0.000
-6.078 0.000
-6.135 0.000
-6.192 0.000
-6.248 0.000
-6.305 0.000
-6.362 0.000
-6.419 0.000
-6.476 0.000
-6.532 0.000
-6.589 0.000
-6.646 0.000
-6.703 0.000
-6.760 0.000
-6.816 0.000
-6.873 0.000
-6.930 0.000
-6.987 0.000
-7.044 0.000
-7.100 0.000
-7.157 0.000
-7.214 0.000
-7.271 0.000
-7.328 0.000
-7.384 0.000
-7.441 0.000
-7.498 0.000
-7.555 0.000
-7.612 0.000
-7.668 0.000
-7.725 0.000
-7.782 0.000
-7.839 0.000
-7.896 0.000
-7.952 0.000
-8.009 0.000
-8.066 0.000
-8.123 0.000
-8.180 0.000
-8.237 0.000
-8.293 0.000
-8.350 0.000
-8.407 0.000
-8.464 0.000
-8.521 0.000
-8.577 0.000
-8.634 0.000
-8.691 0.000
-8.748 0.000
-8.805 0.000
-8.861 0.000
-8.918 0.000
-8.975 0.000
-9.032 0.000
-9.089 0.000
-9.145 0.000
-9.202 0.000
-9.259 0.000
-9.316 0.000
-9.373 0.000
-9.429 0.000
-9.486 0.000
-9.543 0.000
-9.600 0.000
-9.657 0.000
-9.713 0.000
-9.770 0.000
-9.827 0.000
-9.884 0.000
-9.941 0.000
-9.997 0.000
-10.054 0.000
-10.111 0.000
-10.168 0.000
-10.225 0.000
-10.281 0.000
-10.338 0.000
-10.395 0.000
-10.452 0.000
-10.509 0.000
-10.565 0.000
-10.622 0.000
-10.679 0.000
-10.736 0.000
-10.793 0.000
-10.849 0.000
-10.906 0.000
-10.963 0.000
-11.020 0.000
-11.077 0.000
-11.133 0.000
-11.190 0.000
-11.247 0.000
-11.304 0.000
-11.361 0.000
-11.417 0.000
-11.474 0.000
-11.531 0.000
-11.588 0.000
-11.645 0.000
-11.702 0.000
-11.758 0.000
-11.815 0.000
-11.872 0.000
-11.929 0.000
-11.986 0.000
-12.042 0.000
-12.099 0.000
-12.156 0.000
-12.213 0.000
-12.270 0.000
-12.326 0.000
-12.383 0.000
-12.440 0.000
-12.497 0.000
-12.554 0.000
-12.610 0.000
-12.667 0.000
-12.724 0.000
-12.781 0.000
-12.838 0.000
-12.894 0.000
-12.951 0.000
-13.008 0.000
-13.065 0.000
-13.122 0.000
-13.178 0.000
-13.235 0.000
-13.292 0.000
-13.349 0.000
-13.406 0.000
-13.462 0.000
-13.519 0.000
-13.576 0.000
-13.633 0.000
-13.690 0.000
-13.746 0.000
-13.803 0.000
-13.860 0.000
-13.917 0.000
-13.974 0.000
-14.030 0.000
-14.087 0.000
-14.144 0.000
-14.201 0.000
-14.258 0.000
-14.314 0.000
-14.371 0.000
-14.428 0.000
-14.485 0.000
-14.542 0.000
-14.598 0.000
-14.655 0.000
-14.712 0.000
-14.769 0.000
-14.826 0.000
-14.883 0.000
-14.939 0.000
-14.996 0.000
-15.053 0.000
-15.110 0.000
-15.167 0.000
-15.223 0.000
-15.280 0.000
-15.337 0.000
-15.394 0.000
-15.451 0.000
-15.507 0.000
-15.564 0.000
-15.621 0.000
-15.678 0.000
-15.735 0.000
-15.791 0.000
-15.848 0.000
-15.905 0.000
-15.962 0.000
-16.019 0.000
-16.075 0.000
-16.132 0.000
-16.189 0.000
-16.246 0.000
-16.303 0.000
-16.359 0.000
-16.416 0.000
-16.473 0.000
-16.530 0.000
-16.587 0.000
-16.643 0.000
-16.700 0.000
-16.757 0.000
-16.814 0.000
-16.871 0.000
-16.927 0.000
-16.984 0.000
-17.041 0.000
-17.098 0.000
-17.155 0.000
-17.211 0.000
-17.268 0.000
-17.325 0.000
-17.382 0.000
-17.439 0.000
-17.495 0.000
-17.552 0.000
-17.609 0.000
-17.666 0.000
-17.723 0.000
-17.779 0.000
-17.836 0.000
-17.893 0.000
-17.950 0.000
-18.007 0.000
-18.064 0.000
-18.120 0.000
-18.177 0.000
-18.234 0.000
-18.291 0.000
-18.348 0.000
-18.404 0.000
-18.461 0.000
-18.518 0.000
-18.575 0.000
-18.632 0.000
-18.688 0.000
-18.745 0.000
-18.802 0.000
-18.859 0.000
-18.916 0.000
-18.972 0.000
-19.029 0.000
-19.086 0.000
-19.143 0.000
-19.200 0.000
-19.256 0.000
-19.313 0.000
-19.370 0.000
-19.427 0.000
-19.484 0.000
-19.540 0.000
-19.597 0.000
-19.654 0.000
-19.711 0.000
-19.768 0.000
-19.824 0.000
-19.881 0.000
-19.890 0.000
\ No newline at end of file
+0.172 0.000
+0.229 0.000
+0.286 0.000
+0.343 0.000
+0.401 0.000
+0.458 0.000
+0.515 0.000
+0.572 0.000
+0.630 0.000
+0.687 0.000
+0.744 0.000
+0.801 0.000
+0.858 0.000
+0.916 0.000
+0.973 0.000
+0.996 0.000
\ No newline at end of file
diff --git a/main.cpp b/main.cpp
index 3b23a01..cb57821 100755
--- a/main.cpp
+++ b/main.cpp
@@ -1,4 +1,4 @@
-double version=2.42;
+double version=2.43;
 /****************************************************************************\
 *       Signal Server: Server optimised SPLAT! by Alex Farrant               *
 ******************************************************************************
diff --git a/models.cpp b/models.cpp
index 08f386e..ef02b14 100644
--- a/models.cpp
+++ b/models.cpp
@@ -88,7 +88,7 @@ modes 1 = URBAN, 2 = SUBURBAN, 3 = OPEN
 
 	if(f<150 || f>1500){
 	    printf("Error: Hata model frequency range 150-1500MHz\n");
-		return 0;
+            exit(EXIT_FAILURE);
 	}
 	float lRxH = log10(11.75*RxH);
 	float C_H = 3.2*lRxH*lRxH-4.97;
@@ -123,7 +123,7 @@ http://morse.colorado.edu/~tlen5510/text/classwebch3.html
 */
 	if(f<150 || f>2000){
 	    printf("Error: COST231 Hata model frequency range 150-2000MHz\n");
-		return 0;
+		exit(EXIT_FAILURE);
 	}
 
 	int C = 3; // 3dB for Urban
@@ -157,40 +157,49 @@ double SUIpathLoss(float f,float TxH, float RxH, float d, int mode){
 	mode 1 = Hilly + trees
 	mode 2 = Flat + trees OR hilly + light foliage
 	mode 3 = Flat + light foliage
+	http://www.cl.cam.ac.uk/research/dtg/lce-pub/public/vsa23/VTC05_Empirical.pdf
 	*/
 	d=d*1000; // km to m
 	if(f<1900 || f>11000){
 	    printf("Error: SUI model frequency range 1.9-11GHz\n");
-		return 0;
+		exit(EXIT_FAILURE);
 	}
+
 	// Terrain mode A is default
 	double a = 4.6;
 	double b = 0.0075;
-	double c = 12.6; 
-	double s = 10.6; 
+	double c = 12.6;
+	double s = 10.6; // Optional fading value
 	int XhCF = -10.8;
+
 	if(mode==2){
 		a=4.0;
 		b=0.0065;
 		c=17.1;
-		s=9.6;
+		s=6; // average
 	}
 	if(mode==3){
 		a=3.6;
 		b=0.005;
 		c=20;
-		s=8.2;
+		s=3; // Optimistic
 		XhCF = -20;
 	}
 	double d0 = 100; 
 	double A = 20 * log10((4*M_PI*d0)/(300/f));
-	double y = (a - b * TxH) + (c/TxH);
+	double y = (a - b * TxH) + c / TxH;
 	double Xf = 6 * log10(f/2000);
 	double Xh = XhCF * log10(RxH/2);
 	return A + (10*y*log10(d/d0)) + Xf + Xh + s;
 }
 
 double ECC33pathLoss(float f,float TxH, float RxH, float d, int mode){
+
+        if(f<700 || f>3500){
+            printf("Error: ECC33 model frequency range 700-3500MHz\n");
+                exit(EXIT_FAILURE);
+        }
+
 	// MHz to GHz
 	f=f/1000;
 
@@ -206,19 +215,29 @@ double ECC33pathLoss(float f,float TxH, float RxH, float d, int mode){
 }
 
 double EricssonpathLoss(float f,float TxH, float RxH, float d, int mode){
-	double a0=36.2, a1=30.2, a2=12, a3=0.1;
-	if(mode==2){ // Med loss
+        /*
+	http://research.ijcaonline.org/volume84/number7/pxc3892830.pdf
+	AKA Ericsson 9999 model
+	*/
+	// Default is Urban which bizarrely has lowest loss
+	double a0=36.2, a1=30.2, a2=-12, a3=0.1;
+
+        if(f<150 || f>3500){
+            printf("Error: Ericsson9999 model frequency range 150-3500MHz\n");
+                exit(EXIT_FAILURE);
+        }
+
+	if(mode==2){ // Suburban / Med loss
 		a0=43.2;
 		a1=68.93;
 	}
-	if(mode==3){ // Low loss
+	if(mode==1){ // "Rural" but has highest loss according to Ericsson.
 		a0=45.95;
 		a1=100.6;
 	}
 	double g1 = (11.75 * RxH) * (11.75 * RxH); 
 	double g2 = (44.49 * log10(f)) - 4.78 * ((log10(f) * log10(f))); 
-	double PL = a0+ a1 * log10(d) + a2 * log10(TxH) + a3 * log10(TxH) * log10(d) - (3.2 * log10(g1)) + g2;
-	return PL;
+	return a0 + a1 * log10(d) + a2 * log10(TxH) + a3 * log10(TxH) * log10(d) - (3.2 * log10(g1)) + g2;
 }
 
 double FSPLpathLoss(float f, float d){
diff --git a/signalserver b/signalserver
index f23230a..75f9451 100755
Binary files a/signalserver and b/signalserver differ