diff --git a/hwy_data/MD/usaus/md.us220.wpt b/hwy_data/MD/usaus/md.us220.wpt
index f144f9f05c0..c866bb05071 100644
--- a/hwy_data/MD/usaus/md.us220.wpt
+++ b/hwy_data/MD/usaus/md.us220.wpt
@@ -21,4 +21,4 @@ I-68(46) http://www.openstreetmap.org/?lat=39.673015&lon=-78.730431
 I-68(46A) http://www.openstreetmap.org/?lat=39.673635&lon=-78.717341
 +X02 http://www.openstreetmap.org/?lat=39.691915&lon=-78.714659
 MD807 http://www.openstreetmap.org/?lat=39.715077&lon=-78.702965
-MD/PA http://www.openstreetmap.org/?lat=39.722801&lon=-78.706055
+MD/PA http://www.openstreetmap.org/?lat=39.722855&lon=-78.706414
diff --git a/hwy_data/PA/usai/pa.i078.wpt b/hwy_data/PA/usai/pa.i078.wpt
index 86e5e1c8944..87483fcf341 100644
--- a/hwy_data/PA/usai/pa.i078.wpt
+++ b/hwy_data/PA/usai/pa.i078.wpt
@@ -19,6 +19,7 @@
 +X22B http://www.openstreetmap.org/?lat=40.576044&lon=-75.767231
 +X22A http://www.openstreetmap.org/?lat=40.581417&lon=-75.724747
 45 http://www.openstreetmap.org/?lat=40.580126&lon=-75.707753
++X((48)) http://www.openstreetmap.org/?lat=40.575475&lon=-75.658357
 +X23 http://www.openstreetmap.org/?lat=40.575115&lon=-75.652625
 49 http://www.openstreetmap.org/?lat=40.579919&lon=-75.624339
 51 http://www.openstreetmap.org/?lat=40.589091&lon=-75.590401
diff --git a/hwy_data/PA/usai/pa.i099.wpt b/hwy_data/PA/usai/pa.i099.wpt
index b9323c652fb..5a8f66e94d9 100644
--- a/hwy_data/PA/usai/pa.i099.wpt
+++ b/hwy_data/PA/usai/pa.i099.wpt
@@ -1,38 +1,44 @@
-1 http://www.openstreetmap.org/?lat=40.055936&lon=-78.518107
+1 http://www.openstreetmap.org/?lat=40.055909&lon=-78.518112
 +X110 http://www.openstreetmap.org/?lat=40.087214&lon=-78.529343
 3 http://www.openstreetmap.org/?lat=40.095990&lon=-78.529194
-7 http://www.openstreetmap.org/?lat=40.146708&lon=-78.510017
-10 http://www.openstreetmap.org/?lat=40.193562&lon=-78.487143
+7 http://www.openstreetmap.org/?lat=40.146708&lon=-78.510101
+10 http://www.openstreetmap.org/?lat=40.193539&lon=-78.487154
 +X111 http://www.openstreetmap.org/?lat=40.234466&lon=-78.463473
 15 http://www.openstreetmap.org/?lat=40.258485&lon=-78.456794
-+X01 http://www.openstreetmap.org/?lat=40.335684&lon=-78.429594
-23 http://www.openstreetmap.org/?lat=40.369370&lon=-78.435645
++X01 http://www.openstreetmap.org/?lat=40.335680&lon=-78.429508
+23 http://www.openstreetmap.org/?lat=40.369438&lon=-78.435696
++X01C http://www.openstreetmap.org/?lat=40.388581&lon=-78.428805
++X01A http://www.openstreetmap.org/?lat=40.411266&lon=-78.433215
++X01B http://www.openstreetmap.org/?lat=40.421787&lon=-78.423430
 28 http://www.openstreetmap.org/?lat=40.439435&lon=-78.426933
-+X02 http://www.openstreetmap.org/?lat=40.462589&lon=-78.422363
++X02 http://www.openstreetmap.org/?lat=40.462475&lon=-78.422151
 31 http://www.openstreetmap.org/?lat=40.465518&lon=-78.407864
 +X112 http://www.openstreetmap.org/?lat=40.470643&lon=-78.398993
 32 http://www.openstreetmap.org/?lat=40.479435&lon=-78.394189
-33 http://www.openstreetmap.org/?lat=40.493404&lon=-78.383503
-39 http://www.openstreetmap.org/?lat=40.562154&lon=-78.328477
+33 http://www.openstreetmap.org/?lat=40.493392&lon=-78.383479
+39 http://www.openstreetmap.org/?lat=40.562165&lon=-78.328480
 41 http://www.openstreetmap.org/?lat=40.598792&lon=-78.314694
-45 http://www.openstreetmap.org/?lat=40.641735&lon=-78.270850
++X02A http://www.openstreetmap.org/?lat=40.614203&lon=-78.305448
+45 http://www.openstreetmap.org/?lat=40.641798&lon=-78.270939
 48 http://www.openstreetmap.org/?lat=40.670801&lon=-78.235016
 +X4 http://www.openstreetmap.org/?lat=40.699121&lon=-78.213258
-52 http://www.openstreetmap.org/?lat=40.711011&lon=-78.188367
+52 http://www.openstreetmap.org/?lat=40.710983&lon=-78.188539
 +X5 http://www.openstreetmap.org/?lat=40.723258&lon=-78.146009
++X5A http://www.openstreetmap.org/?lat=40.747680&lon=-78.106050
 +X6 http://www.openstreetmap.org/?lat=40.784408&lon=-78.067431
 61 http://www.openstreetmap.org/?lat=40.804024&lon=-78.063697
 62 http://www.openstreetmap.org/?lat=40.809278&lon=-78.056939
++X6A http://www.openstreetmap.org/?lat=40.810348&lon=-78.034365
 *AthSt http://www.openstreetmap.org/?lat=40.833295&lon=-77.968855
-68 http://www.openstreetmap.org/?lat=40.818210&lon=-77.939823
+68 http://www.openstreetmap.org/?lat=40.818210&lon=-77.939871
 69 http://www.openstreetmap.org/?lat=40.815563&lon=-77.928343
 69A http://www.openstreetmap.org/?lat=40.815465&lon=-77.918644
-71 http://www.openstreetmap.org/?lat=40.818828&lon=-77.900619
+71 http://www.openstreetmap.org/?lat=40.818791&lon=-77.900711
 73 http://www.openstreetmap.org/?lat=40.825582&lon=-77.843971
 74 http://www.openstreetmap.org/?lat=40.834755&lon=-77.835582
-76 http://www.openstreetmap.org/?lat=40.846508&lon=-77.811935
+76 http://www.openstreetmap.org/?lat=40.846496&lon=-77.811989
 78 http://www.openstreetmap.org/?lat=40.872604&lon=-77.778651
-80 http://www.openstreetmap.org/?lat=40.884415&lon=-77.740309
+80 http://www.openstreetmap.org/?lat=40.884411&lon=-77.740331
 81 http://www.openstreetmap.org/?lat=40.889526&lon=-77.732735
 83 http://www.openstreetmap.org/?lat=40.915312&lon=-77.741618
-MusLn http://www.openstreetmap.org/?lat=40.938463&lon=-77.730675
+MusLn http://www.openstreetmap.org/?lat=40.938460&lon=-77.730723
diff --git a/hwy_data/PA/usapa/pa.pa026.wpt b/hwy_data/PA/usapa/pa.pa026.wpt
index 41df68eaa59..f369a09651f 100644
--- a/hwy_data/PA/usapa/pa.pa026.wpt
+++ b/hwy_data/PA/usapa/pa.pa026.wpt
@@ -19,7 +19,7 @@ US30BusEve_W http://www.openstreetmap.org/?lat=40.011251&lon=-78.373225
 10thSt http://www.openstreetmap.org/?lat=40.024838&lon=-78.373203
 BudShuByp http://www.openstreetmap.org/?lat=40.051427&lon=-78.360372
 CypRd http://www.openstreetmap.org/?lat=40.096376&lon=-78.346252
-PA36 http://www.openstreetmap.org/?lat=40.136645&lon=-78.341231
+PA36 http://www.openstreetmap.org/?lat=40.136645&lon=-78.341258
 PriHillRd http://www.openstreetmap.org/?lat=40.128934&lon=-78.324494
 PinRd http://www.openstreetmap.org/?lat=40.143985&lon=-78.296471
 PA915 http://www.openstreetmap.org/?lat=40.138088&lon=-78.266816
@@ -28,7 +28,7 @@ SixMRunRd http://www.openstreetmap.org/?lat=40.162051&lon=-78.255787
 +X4 http://www.openstreetmap.org/?lat=40.202920&lon=-78.272610
 PA913 http://www.openstreetmap.org/?lat=40.214522&lon=-78.269112
 HenMouRd http://www.openstreetmap.org/?lat=40.216332&lon=-78.274906
-PA164 http://www.openstreetmap.org/?lat=40.261062&lon=-78.256624
+PA164 http://www.openstreetmap.org/?lat=40.261404&lon=-78.256398
 PA994 http://www.openstreetmap.org/?lat=40.335648&lon=-78.208615
 AitRd http://www.openstreetmap.org/?lat=40.382987&lon=-78.173132
 FaiRd_S http://www.openstreetmap.org/?lat=40.468972&lon=-78.062539
@@ -54,12 +54,14 @@ GriCampLn http://www.openstreetmap.org/?lat=40.728869&lon=-77.878089
 +X5 http://www.openstreetmap.org/?lat=40.728015&lon=-77.883904
 PA45_W http://www.openstreetmap.org/?lat=40.733917&lon=-77.885814
 PA45_E http://www.openstreetmap.org/?lat=40.748614&lon=-77.869699
+WhiRd http://www.openstreetmap.org/?lat=40.759946&lon=-77.877984
 SciParkRd http://www.openstreetmap.org/?lat=40.773311&lon=-77.887402
 BlueCouDr http://www.openstreetmap.org/?lat=40.779550&lon=-77.880235
-US322Bus +US322BusAth http://www.openstreetmap.org/?lat=40.791362&lon=-77.864410
+US322Bus +US322BusAth http://www.openstreetmap.org/?lat=40.791327&lon=-77.864453
 ShorRd http://www.openstreetmap.org/?lat=40.797395&lon=-77.856320
 UniDr http://www.openstreetmap.org/?lat=40.802318&lon=-77.850773
 US322 http://www.openstreetmap.org/?lat=40.812104&lon=-77.828479
+HouRd http://www.openstreetmap.org/?lat=40.818159&lon=-77.818565
 PA150_S http://www.openstreetmap.org/?lat=40.829233&lon=-77.805463
 ShiRd http://www.openstreetmap.org/?lat=40.834212&lon=-77.795992
 PA144 http://www.openstreetmap.org/?lat=40.867919&lon=-77.746553
@@ -67,8 +69,8 @@ HarRd http://www.openstreetmap.org/?lat=40.872523&lon=-77.737026
 PA64 http://www.openstreetmap.org/?lat=40.880794&lon=-77.722547
 I-99(81) http://www.openstreetmap.org/?lat=40.889526&lon=-77.732735
 I-99(83) http://www.openstreetmap.org/?lat=40.915312&lon=-77.741618
-MusLn http://www.openstreetmap.org/?lat=40.938463&lon=-77.730675
-JacRd_S http://www.openstreetmap.org/?lat=40.940040&lon=-77.728977
+MusLn http://www.openstreetmap.org/?lat=40.938460&lon=-77.730723
+JacRd_S http://www.openstreetmap.org/?lat=40.940046&lon=-77.728966
 I-80 http://www.openstreetmap.org/?lat=40.944833&lon=-77.720160
 JacRd_N http://www.openstreetmap.org/?lat=40.988354&lon=-77.638321
 +X6 http://www.openstreetmap.org/?lat=40.989819&lon=-77.642484
diff --git a/hwy_data/PA/usapa/pa.pa036.wpt b/hwy_data/PA/usapa/pa.pa036.wpt
index 36ce05f2f29..d752daaadd1 100644
--- a/hwy_data/PA/usapa/pa.pa036.wpt
+++ b/hwy_data/PA/usapa/pa.pa036.wpt
@@ -1,12 +1,20 @@
-PA26 http://www.openstreetmap.org/?lat=40.136645&lon=-78.341231
-PA869 http://www.openstreetmap.org/?lat=40.172508&lon=-78.379437
-PA868 http://www.openstreetmap.org/?lat=40.189807&lon=-78.376057
+PA26 http://www.openstreetmap.org/?lat=40.136645&lon=-78.341258
+JacCorRd http://www.openstreetmap.org/?lat=40.157861&lon=-78.356389
+ChuRd http://www.openstreetmap.org/?lat=40.160866&lon=-78.373447
+PA869 http://www.openstreetmap.org/?lat=40.172530&lon=-78.379445
+PA868 http://www.openstreetmap.org/?lat=40.189705&lon=-78.376052
+HicBotRd http://www.openstreetmap.org/?lat=40.201979&lon=-78.376288
+PCBraRd http://www.openstreetmap.org/?lat=40.216607&lon=-78.371771
+StaSt http://www.openstreetmap.org/?lat=40.228694&lon=-78.365280
 PA866 http://www.openstreetmap.org/?lat=40.235648&lon=-78.362324
-CroCoveRd http://www.openstreetmap.org/?lat=40.295648&lon=-78.382130
-PA164_E http://www.openstreetmap.org/?lat=40.335930&lon=-78.390884
-PA867 http://www.openstreetmap.org/?lat=40.342034&lon=-78.403062
+KenRd http://www.openstreetmap.org/?lat=40.274823&lon=-78.369494
+CroCoveRd http://www.openstreetmap.org/?lat=40.295724&lon=-78.382063
+CabCreRd http://www.openstreetmap.org/?lat=40.315428&lon=-78.393497
+PA164_E http://www.openstreetmap.org/?lat=40.336024&lon=-78.390855
+SpaSt http://www.openstreetmap.org/?lat=40.339994&lon=-78.396823
+PA867 http://www.openstreetmap.org/?lat=40.342139&lon=-78.403080
 FreSt http://www.openstreetmap.org/?lat=40.361071&lon=-78.419080
-PA164_W http://www.openstreetmap.org/?lat=40.366959&lon=-78.426611
+PA164_W http://www.openstreetmap.org/?lat=40.366949&lon=-78.426520
 MonRd http://www.openstreetmap.org/?lat=40.395604&lon=-78.413200
 LoopRd http://www.openstreetmap.org/?lat=40.425993&lon=-78.388696
 US22 http://www.openstreetmap.org/?lat=40.428319&lon=-78.389484
diff --git a/hwy_data/PA/usapa/pa.pa045.wpt b/hwy_data/PA/usapa/pa.pa045.wpt
index 365f2b9708b..62cc28f6173 100644
--- a/hwy_data/PA/usapa/pa.pa045.wpt
+++ b/hwy_data/PA/usapa/pa.pa045.wpt
@@ -1,22 +1,25 @@
-PA453/45Trk http://www.openstreetmap.org/?lat=40.581184&lon=-78.143338
-+X1 http://www.openstreetmap.org/?lat=40.601800&lon=-78.132706
+PA453/45Trk http://www.openstreetmap.org/?lat=40.581165&lon=-78.143429
++X1 http://www.openstreetmap.org/?lat=40.601788&lon=-78.132808
 +X2 http://www.openstreetmap.org/?lat=40.608756&lon=-78.137684
-UniFurRd http://www.openstreetmap.org/?lat=40.612201&lon=-78.139915
+UniFurRd http://www.openstreetmap.org/?lat=40.612203&lon=-78.139875
 EdenHillRd http://www.openstreetmap.org/?lat=40.609151&lon=-78.135914
-PA350/45Trk http://www.openstreetmap.org/?lat=40.658577&lon=-78.081679
+HunFurRd http://www.openstreetmap.org/?lat=40.638619&lon=-78.101815
++X3 http://www.openstreetmap.org/?lat=40.638237&lon=-78.097400
+PA350/45Trk http://www.openstreetmap.org/?lat=40.658626&lon=-78.081636
 JonRd http://www.openstreetmap.org/?lat=40.701716&lon=-77.999496
 PA26_S http://www.openstreetmap.org/?lat=40.733917&lon=-77.885814
 PA26_N http://www.openstreetmap.org/?lat=40.748614&lon=-77.869699
-US322BusSta_W http://www.openstreetmap.org/?lat=40.781126&lon=-77.801099
-US322BusSta_E http://www.openstreetmap.org/?lat=40.776869&lon=-77.787924
-US322 http://www.openstreetmap.org/?lat=40.781321&lon=-77.779770
+BraRd http://www.openstreetmap.org/?lat=40.759629&lon=-77.843813
+US322BusSta_W http://www.openstreetmap.org/?lat=40.781110&lon=-77.801080
+US322BusSta_E http://www.openstreetmap.org/?lat=40.776751&lon=-77.787937
+US322 http://www.openstreetmap.org/?lat=40.781323&lon=-77.779724
 LinHallRd http://www.openstreetmap.org/?lat=40.787991&lon=-77.757902
 CedRunRd http://www.openstreetmap.org/?lat=40.791463&lon=-77.747068
 HootRd http://www.openstreetmap.org/?lat=40.807518&lon=-77.713946
-PA144 http://www.openstreetmap.org/?lat=40.835214&lon=-77.672439
+PA144 http://www.openstreetmap.org/?lat=40.835188&lon=-77.672498
 PenCaveRd http://www.openstreetmap.org/?lat=40.856320&lon=-77.573570
 BruMouRd http://www.openstreetmap.org/?lat=40.867014&lon=-77.549419
-PA445 http://www.openstreetmap.org/?lat=40.890925&lon=-77.476788
+PA445 http://www.openstreetmap.org/?lat=40.890963&lon=-77.476774
 BowHolRd http://www.openstreetmap.org/?lat=40.905283&lon=-77.421684
 WooGapRd http://www.openstreetmap.org/?lat=40.898439&lon=-77.353406
 WinMouRd http://www.openstreetmap.org/?lat=40.909900&lon=-77.283615
diff --git a/hwy_data/PA/usapa/pa.pa045trkspr.wpt b/hwy_data/PA/usapa/pa.pa045trkspr.wpt
index 59c8a6a4307..50ad6281494 100644
--- a/hwy_data/PA/usapa/pa.pa045trkspr.wpt
+++ b/hwy_data/PA/usapa/pa.pa045trkspr.wpt
@@ -1,8 +1,14 @@
-PA45_W http://www.openstreetmap.org/?lat=40.581184&lon=-78.143338
+PA45_W http://www.openstreetmap.org/?lat=40.581165&lon=-78.143429
 KetRd http://www.openstreetmap.org/?lat=40.613116&lon=-78.170326
 +X1 http://www.openstreetmap.org/?lat=40.625932&lon=-78.173604
+HunFurRd http://www.openstreetmap.org/?lat=40.633262&lon=-78.185907
 TyrSt http://www.openstreetmap.org/?lat=40.648728&lon=-78.198205
-PA453/550 http://www.openstreetmap.org/?lat=40.665261&lon=-78.223836
-PA350/550 http://www.openstreetmap.org/?lat=40.703127&lon=-78.129337
-HunFurRd http://www.openstreetmap.org/?lat=40.666101&lon=-78.104725
-PA45_E http://www.openstreetmap.org/?lat=40.658577&lon=-78.081679
++X1R http://www.openstreetmap.org/?lat=40.651547&lon=-78.200815
+HunSprRd_S http://www.openstreetmap.org/?lat=40.654501&lon=-78.204519
+PA453/550 http://www.openstreetmap.org/?lat=40.665263&lon=-78.223906
+RidRd http://www.openstreetmap.org/?lat=40.676985&lon=-78.201778
+StiRd http://www.openstreetmap.org/?lat=40.689244&lon=-78.176265
+HunSprRd_N http://www.openstreetmap.org/?lat=40.694478&lon=-78.149059
+PA350/550 http://www.openstreetmap.org/?lat=40.703149&lon=-78.129326
+OldMillRd http://www.openstreetmap.org/?lat=40.666091&lon=-78.104703
+PA45_E http://www.openstreetmap.org/?lat=40.658626&lon=-78.081636
diff --git a/hwy_data/PA/usapa/pa.pa064.wpt b/hwy_data/PA/usapa/pa.pa064.wpt
index 1b93aee1328..5c662d2c740 100644
--- a/hwy_data/PA/usapa/pa.pa064.wpt
+++ b/hwy_data/PA/usapa/pa.pa064.wpt
@@ -1,9 +1,15 @@
 PA26 http://www.openstreetmap.org/?lat=40.880794&lon=-77.722547
-PA550 http://www.openstreetmap.org/?lat=40.918941&lon=-77.676612
+ZionBackRd http://www.openstreetmap.org/?lat=40.908524&lon=-77.682526
+PA550 http://www.openstreetmap.org/?lat=40.918182&lon=-77.677438
 HecRd http://www.openstreetmap.org/?lat=40.935872&lon=-77.649444
 HubRidRd http://www.openstreetmap.org/?lat=40.961641&lon=-77.611080
-PA445 http://www.openstreetmap.org/?lat=40.997678&lon=-77.556417
+HoyRd http://www.openstreetmap.org/?lat=40.990494&lon=-77.565582
+PA445 http://www.openstreetmap.org/?lat=40.997672&lon=-77.556484
 WasAve http://www.openstreetmap.org/?lat=41.010202&lon=-77.539929
+SprRunRd http://www.openstreetmap.org/?lat=41.015851&lon=-77.531137
 I-80 http://www.openstreetmap.org/?lat=41.031127&lon=-77.519207
+HelRd http://www.openstreetmap.org/?lat=41.054190&lon=-77.496631
+JacRd http://www.openstreetmap.org/?lat=41.080271&lon=-77.481495
 PA477 http://www.openstreetmap.org/?lat=41.086892&lon=-77.479534
+ChuSt http://www.openstreetmap.org/?lat=41.104027&lon=-77.487144
 PA150 http://www.openstreetmap.org/?lat=41.113115&lon=-77.487900
diff --git a/hwy_data/PA/usapa/pa.pa144.wpt b/hwy_data/PA/usapa/pa.pa144.wpt
index dbaa10e04c3..3f4f16b9b38 100644
--- a/hwy_data/PA/usapa/pa.pa144.wpt
+++ b/hwy_data/PA/usapa/pa.pa144.wpt
@@ -1,6 +1,6 @@
 US322 http://www.openstreetmap.org/?lat=40.794611&lon=-77.625103
 TucRd http://www.openstreetmap.org/?lat=40.816970&lon=-77.644058
-PA45 http://www.openstreetmap.org/?lat=40.835214&lon=-77.672439
+PA45 http://www.openstreetmap.org/?lat=40.835188&lon=-77.672498
 PA192 http://www.openstreetmap.org/?lat=40.848156&lon=-77.687800
 BlaHawkRd http://www.openstreetmap.org/?lat=40.846123&lon=-77.722993
 HarRd http://www.openstreetmap.org/?lat=40.865095&lon=-77.734408
@@ -11,7 +11,7 @@ IriHolRd http://www.openstreetmap.org/?lat=40.889805&lon=-77.760479
 +X3 http://www.openstreetmap.org/?lat=40.891249&lon=-77.766616
 MillSt http://www.openstreetmap.org/?lat=40.907182&lon=-77.780081
 StoBatSt http://www.openstreetmap.org/?lat=40.909333&lon=-77.779301
-PA550_N http://www.openstreetmap.org/?lat=40.910780&lon=-77.777410
+PA550_N http://www.openstreetmap.org/?lat=40.910756&lon=-77.777412
 PA550_S http://www.openstreetmap.org/?lat=40.912065&lon=-77.777892
 LinnSt_E http://www.openstreetmap.org/?lat=40.915793&lon=-77.779287
 PA150_S http://www.openstreetmap.org/?lat=40.916245&lon=-77.784794
diff --git a/hwy_data/PA/usapa/pa.pa144trkcen.wpt b/hwy_data/PA/usapa/pa.pa144trkcen.wpt
index 8b8a54ef759..4b2a640840e 100644
--- a/hwy_data/PA/usapa/pa.pa144trkcen.wpt
+++ b/hwy_data/PA/usapa/pa.pa144trkcen.wpt
@@ -1,3 +1,5 @@
-PA144 https://www.openstreetmap.org/?lat=40.835214&lon=-77.672439
-KenLn http://www.openstreetmap.org/?lat=40.795395&lon=-77.732273
-US322/45 https://www.openstreetmap.org/?lat=40.781321&lon=-77.779770
+PA144 http://www.openstreetmap.org/?lat=40.835188&lon=-77.672498
+HootRd http://www.openstreetmap.org/?lat=40.807518&lon=-77.713946
+CedRunRd http://www.openstreetmap.org/?lat=40.791463&lon=-77.747068
+LinHallRd http://www.openstreetmap.org/?lat=40.787991&lon=-77.757902
+US322/45 http://www.openstreetmap.org/?lat=40.781323&lon=-77.779724
diff --git a/hwy_data/PA/usapa/pa.pa144trkpot.wpt b/hwy_data/PA/usapa/pa.pa144trkpot.wpt
index 94c996b7a06..b228788944c 100644
--- a/hwy_data/PA/usapa/pa.pa144trkpot.wpt
+++ b/hwy_data/PA/usapa/pa.pa144trkpot.wpt
@@ -1,11 +1,12 @@
 PA144_S http://www.openstreetmap.org/?lat=40.794611&lon=-77.625103
 WagRd http://www.openstreetmap.org/?lat=40.792198&lon=-77.700441
-US322BusSta +US322BusSta_E http://www.openstreetmap.org/?lat=40.779372&lon=-77.775521
-US322/45 http://www.openstreetmap.org/?lat=40.781321&lon=-77.779770
+US322BusSta +US322BusSta_E http://www.openstreetmap.org/?lat=40.779270&lon=-77.775527
+US322/45 http://www.openstreetmap.org/?lat=40.781323&lon=-77.779724
 WarBlvd http://www.openstreetmap.org/?lat=40.789640&lon=-77.799039
 +X17 http://www.openstreetmap.org/?lat=40.792418&lon=-77.815819
 +X16 http://www.openstreetmap.org/?lat=40.803204&lon=-77.827191
 US322/26 http://www.openstreetmap.org/?lat=40.812104&lon=-77.828479
+HouRd http://www.openstreetmap.org/?lat=40.818159&lon=-77.818565
 PA150  +PA150_S http://www.openstreetmap.org/?lat=40.829233&lon=-77.805463
 ShiRd http://www.openstreetmap.org/?lat=40.834212&lon=-77.795992
 PA144_N http://www.openstreetmap.org/?lat=40.867919&lon=-77.746553
diff --git a/hwy_data/PA/usapa/pa.pa164.wpt b/hwy_data/PA/usapa/pa.pa164.wpt
index d2adbe061ac..442003e9ccb 100644
--- a/hwy_data/PA/usapa/pa.pa164.wpt
+++ b/hwy_data/PA/usapa/pa.pa164.wpt
@@ -4,20 +4,24 @@ RobRd http://www.openstreetmap.org/?lat=40.412571&lon=-78.679909
 PA53_N http://www.openstreetmap.org/?lat=40.393606&lon=-78.668077
 PA53_S http://www.openstreetmap.org/?lat=40.394090&lon=-78.671173
 DulDr http://www.openstreetmap.org/?lat=40.390301&lon=-78.672173
-MainSt_S http://www.openstreetmap.org/?lat=40.381606&lon=-78.672774
-+X3 http://www.openstreetmap.org/?lat=40.352464&lon=-78.615503
-CioLn http://www.openstreetmap.org/?lat=40.357934&lon=-78.607929
-FraRd http://www.openstreetmap.org/?lat=40.352607&lon=-78.603230
+SprHillRd http://www.openstreetmap.org/?lat=40.381690&lon=-78.672870
++X3 http://www.openstreetmap.org/?lat=40.352388&lon=-78.615503
++X3A http://www.openstreetmap.org/?lat=40.357858&lon=-78.607958
+FraRd http://www.openstreetmap.org/?lat=40.352538&lon=-78.603152
+DiaLn http://www.openstreetmap.org/?lat=40.352217&lon=-78.586769
 KnobRd http://www.openstreetmap.org/?lat=40.355121&lon=-78.553244
-PolHolRd http://www.openstreetmap.org/?lat=40.354860&lon=-78.511584
+PolRd +PolHolRd http://www.openstreetmap.org/?lat=40.354847&lon=-78.511608
 US220Bus_S http://www.openstreetmap.org/?lat=40.356730&lon=-78.430270
 US220Bus_N http://www.openstreetmap.org/?lat=40.368252&lon=-78.429787
-PA36_N http://www.openstreetmap.org/?lat=40.366959&lon=-78.426611
+PA36_N http://www.openstreetmap.org/?lat=40.366949&lon=-78.426520
 FreSt http://www.openstreetmap.org/?lat=40.361071&lon=-78.419080
-PA867 http://www.openstreetmap.org/?lat=40.342034&lon=-78.403062
-PA36_S http://www.openstreetmap.org/?lat=40.335930&lon=-78.390884
-PA866 http://www.openstreetmap.org/?lat=40.311301&lon=-78.325031
-+X4 http://www.openstreetmap.org/?lat=40.302031&lon=-78.272009
-+X5 http://www.openstreetmap.org/?lat=40.291516&lon=-78.268318
-+X6 http://www.openstreetmap.org/?lat=40.296966&lon=-78.258705
-PA26 http://www.openstreetmap.org/?lat=40.261062&lon=-78.256624
+PA867 http://www.openstreetmap.org/?lat=40.342139&lon=-78.403080
+SpaSt http://www.openstreetmap.org/?lat=40.339994&lon=-78.396823
+PA36_S http://www.openstreetmap.org/?lat=40.336024&lon=-78.390855
+PlumCreRd http://www.openstreetmap.org/?lat=40.332928&lon=-78.369845
+PA866 http://www.openstreetmap.org/?lat=40.311346&lon=-78.325039
+CloCreRd http://www.openstreetmap.org/?lat=40.306570&lon=-78.282271
+HenRd http://www.openstreetmap.org/?lat=40.303855&lon=-78.275793
++X5 http://www.openstreetmap.org/?lat=40.291352&lon=-78.268071
++X6 http://www.openstreetmap.org/?lat=40.296908&lon=-78.258732
+PA26 http://www.openstreetmap.org/?lat=40.261404&lon=-78.256398
diff --git a/hwy_data/PA/usapa/pa.pa192.wpt b/hwy_data/PA/usapa/pa.pa192.wpt
index 055ff795db7..c55fcdf166d 100644
--- a/hwy_data/PA/usapa/pa.pa192.wpt
+++ b/hwy_data/PA/usapa/pa.pa192.wpt
@@ -2,6 +2,7 @@ PA144 http://www.openstreetmap.org/?lat=40.848156&lon=-77.687800
 BlueBallRd http://www.openstreetmap.org/?lat=40.882402&lon=-77.622657
 PenCaveRd http://www.openstreetmap.org/?lat=40.888810&lon=-77.608197
 BruMouRd http://www.openstreetmap.org/?lat=40.906231&lon=-77.567940
+GinGapRd http://www.openstreetmap.org/?lat=40.913225&lon=-77.545141
 PA445_N http://www.openstreetmap.org/?lat=40.922868&lon=-77.514824
 PA445_S http://www.openstreetmap.org/?lat=40.931179&lon=-77.488278
 PA880 http://www.openstreetmap.org/?lat=40.944564&lon=-77.445655
diff --git a/hwy_data/PA/usapa/pa.pa350.wpt b/hwy_data/PA/usapa/pa.pa350.wpt
index fe05d2c52f4..fe617cad042 100644
--- a/hwy_data/PA/usapa/pa.pa350.wpt
+++ b/hwy_data/PA/usapa/pa.pa350.wpt
@@ -1,14 +1,14 @@
-PA45 http://www.openstreetmap.org/?lat=40.658577&lon=-78.081679
-HunFurRd http://www.openstreetmap.org/?lat=40.666101&lon=-78.104725
-PA550/45Trk http://www.openstreetmap.org/?lat=40.703127&lon=-78.129337
-RidRd http://www.openstreetmap.org/?lat=40.714281&lon=-78.141761
-I-99 http://www.openstreetmap.org/?lat=40.718554&lon=-78.185899
+PA45 http://www.openstreetmap.org/?lat=40.658626&lon=-78.081636
+OldMillRd http://www.openstreetmap.org/?lat=40.666091&lon=-78.104703
+PA550/45Trk http://www.openstreetmap.org/?lat=40.703149&lon=-78.129326
+RidRd http://www.openstreetmap.org/?lat=40.714249&lon=-78.141857
+I-99 http://www.openstreetmap.org/?lat=40.718589&lon=-78.185958
 US220Bus http://www.openstreetmap.org/?lat=40.721744&lon=-78.185315
-StaLnExt http://www.openstreetmap.org/?lat=40.744501&lon=-78.199975
+StaLnExt http://www.openstreetmap.org/?lat=40.744451&lon=-78.200072
 +X2 http://www.openstreetmap.org/?lat=40.763020&lon=-78.234608
 +X3 http://www.openstreetmap.org/?lat=40.783230&lon=-78.240525
 PonDr http://www.openstreetmap.org/?lat=40.808253&lon=-78.225084
-PhoRd http://www.openstreetmap.org/?lat=40.859251&lon=-78.217042
-MilRd http://www.openstreetmap.org/?lat=40.881637&lon=-78.211791
+PhoRd http://www.openstreetmap.org/?lat=40.859257&lon=-78.217042
+MilRd http://www.openstreetmap.org/?lat=40.881639&lon=-78.211788
 SchSt http://www.openstreetmap.org/?lat=40.888834&lon=-78.213260
 PA53/504 http://www.openstreetmap.org/?lat=40.896494&lon=-78.220470
diff --git a/hwy_data/PA/usapa/pa.pa445.wpt b/hwy_data/PA/usapa/pa.pa445.wpt
index 4301af6f26a..09799df1040 100644
--- a/hwy_data/PA/usapa/pa.pa445.wpt
+++ b/hwy_data/PA/usapa/pa.pa445.wpt
@@ -1,9 +1,12 @@
-PA45 https://www.openstreetmap.org/?lat=40.890925&lon=-77.476788
+PA45 http://www.openstreetmap.org/?lat=40.890963&lon=-77.476774
++X0A http://www.openstreetmap.org/?lat=40.904912&lon=-77.481621
++X0B http://www.openstreetmap.org/?lat=40.908664&lon=-77.477367
 PA192_E http://www.openstreetmap.org/?lat=40.931179&lon=-77.488278
 PA192_W http://www.openstreetmap.org/?lat=40.922868&lon=-77.514824
 +X1 http://www.openstreetmap.org/?lat=40.937045&lon=-77.523715
-+X2 http://www.openstreetmap.org/?lat=40.937203&lon=-77.531129
-OldPikeRd http://www.openstreetmap.org/?lat=40.941584&lon=-77.524424
-BateDr http://www.openstreetmap.org/?lat=40.942050&lon=-77.538553
-+X3 http://www.openstreetmap.org/?lat=40.971223&lon=-77.536376
-PA64 https://www.openstreetmap.org/?lat=40.997678&lon=-77.556417
+GinGapRd http://www.openstreetmap.org/?lat=40.937552&lon=-77.531113
++X1A http://www.openstreetmap.org/?lat=40.941841&lon=-77.524461
++X1B http://www.openstreetmap.org/?lat=40.942317&lon=-77.538508
++X3 http://www.openstreetmap.org/?lat=40.971286&lon=-77.536249
+RodRd http://www.openstreetmap.org/?lat=40.987951&lon=-77.547027
+PA64 http://www.openstreetmap.org/?lat=40.997672&lon=-77.556484
diff --git a/hwy_data/PA/usapa/pa.pa453.wpt b/hwy_data/PA/usapa/pa.pa453.wpt
index 3581a03404c..fa6ab2c0044 100644
--- a/hwy_data/PA/usapa/pa.pa453.wpt
+++ b/hwy_data/PA/usapa/pa.pa453.wpt
@@ -1,39 +1,45 @@
 US22 http://www.openstreetmap.org/?lat=40.571138&lon=-78.138762
-PA45 +PA45_S http://www.openstreetmap.org/?lat=40.581184&lon=-78.143338
+PA45 +PA45_S http://www.openstreetmap.org/?lat=40.581165&lon=-78.143429
 KetRd http://www.openstreetmap.org/?lat=40.613116&lon=-78.170326
 +X1 http://www.openstreetmap.org/?lat=40.625932&lon=-78.173604
+HunFurRd http://www.openstreetmap.org/?lat=40.633262&lon=-78.185907
 TyrSt http://www.openstreetmap.org/?lat=40.648728&lon=-78.198205
-PA45Trk/550 http://www.openstreetmap.org/?lat=40.665261&lon=-78.223836
++X1R http://www.openstreetmap.org/?lat=40.651547&lon=-78.200815
+HunSprRd http://www.openstreetmap.org/?lat=40.654501&lon=-78.204519
+PA45Trk/550 http://www.openstreetmap.org/?lat=40.665263&lon=-78.223906
 I-99 http://www.openstreetmap.org/?lat=40.670801&lon=-78.235016
 US220Bus_S http://www.openstreetmap.org/?lat=40.671753&lon=-78.237784
 US220Bus_N http://www.openstreetmap.org/?lat=40.675486&lon=-78.236223
 ColAve http://www.openstreetmap.org/?lat=40.678099&lon=-78.240726
 ClayAve http://www.openstreetmap.org/?lat=40.678671&lon=-78.246185
++X2R http://www.openstreetmap.org/?lat=40.678785&lon=-78.253748
 +X1A http://www.openstreetmap.org/?lat=40.681736&lon=-78.261752
-+X2 http://www.openstreetmap.org/?lat=40.703928&lon=-78.290420
-+X3 http://www.openstreetmap.org/?lat=40.704896&lon=-78.294539
-+X4 http://www.openstreetmap.org/?lat=40.701081&lon=-78.296921
++X3R http://www.openstreetmap.org/?lat=40.690208&lon=-78.274088
++X2 http://www.openstreetmap.org/?lat=40.703867&lon=-78.290444
++X3 http://www.openstreetmap.org/?lat=40.704813&lon=-78.294529
++X4 http://www.openstreetmap.org/?lat=40.700984&lon=-78.296927
++X3C http://www.openstreetmap.org/?lat=40.707303&lon=-78.314401
 +X3A http://www.openstreetmap.org/?lat=40.726909&lon=-78.333871
-TipRd http://www.openstreetmap.org/?lat=40.725112&lon=-78.353505
-+X3B http://www.openstreetmap.org/?lat=40.725316&lon=-78.363140
+TipRd http://www.openstreetmap.org/?lat=40.725116&lon=-78.353551
++X3B http://www.openstreetmap.org/?lat=40.725374&lon=-78.363086
 PA253_S http://www.openstreetmap.org/?lat=40.746895&lon=-78.395525
 PA153 http://www.openstreetmap.org/?lat=40.751979&lon=-78.401334
 PA729 http://www.openstreetmap.org/?lat=40.758073&lon=-78.416529
 +X5BB http://www.openstreetmap.org/?lat=40.786116&lon=-78.410143
 PA253_N http://www.openstreetmap.org/?lat=40.798010&lon=-78.397472
-VulRd http://www.openstreetmap.org/?lat=40.806347&lon=-78.407257
+VulRd http://www.openstreetmap.org/?lat=40.806223&lon=-78.407047
 CroRoaBlvd http://www.openstreetmap.org/?lat=40.799575&lon=-78.426129
 CheRd http://www.openstreetmap.org/?lat=40.819704&lon=-78.435168
 PA53_N http://www.openstreetmap.org/?lat=40.828208&lon=-78.435436
 PA53_S http://www.openstreetmap.org/?lat=40.827370&lon=-78.437568
-+X5 http://www.openstreetmap.org/?lat=40.830737&lon=-78.445022
++X5 http://www.openstreetmap.org/?lat=40.830753&lon=-78.445006
 PineRunRd http://www.openstreetmap.org/?lat=40.851705&lon=-78.447106
 +X9 http://www.openstreetmap.org/?lat=40.865546&lon=-78.444609
-OakRidRd http://www.openstreetmap.org/?lat=40.877999&lon=-78.463304
-KelRd http://www.openstreetmap.org/?lat=40.889988&lon=-78.459957
-McCRd http://www.openstreetmap.org/?lat=40.897749&lon=-78.484654
+OakRidRd http://www.openstreetmap.org/?lat=40.877979&lon=-78.463229
+KelRd http://www.openstreetmap.org/?lat=40.890045&lon=-78.459892
+McCRd http://www.openstreetmap.org/?lat=40.897743&lon=-78.484738
 ZionRd http://www.openstreetmap.org/?lat=40.905264&lon=-78.488104
-LitCleCRd http://www.openstreetmap.org/?lat=40.916606&lon=-78.505745
+LCCreRd http://www.openstreetmap.org/?lat=40.916606&lon=-78.505745
 DouRd http://www.openstreetmap.org/?lat=40.927302&lon=-78.524501
 BloGRRd http://www.openstreetmap.org/?lat=40.935035&lon=-78.523257
 CarRd http://www.openstreetmap.org/?lat=40.940220&lon=-78.517621
diff --git a/hwy_data/PA/usapa/pa.pa550.wpt b/hwy_data/PA/usapa/pa.pa550.wpt
index 6b7486495e0..6c0ccb0070f 100644
--- a/hwy_data/PA/usapa/pa.pa550.wpt
+++ b/hwy_data/PA/usapa/pa.pa550.wpt
@@ -1,21 +1,28 @@
-PA453/45Trk http://www.openstreetmap.org/?lat=40.665261&lon=-78.223836
-PA350/45Trk http://www.openstreetmap.org/?lat=40.703127&lon=-78.129337
-DunRd http://www.openstreetmap.org/?lat=40.714887&lon=-78.109950
-RidRd http://www.openstreetmap.org/?lat=40.722888&lon=-78.118351
-PortMouRd http://www.openstreetmap.org/?lat=40.778064&lon=-78.041983
-AthSt http://www.openstreetmap.org/?lat=40.828383&lon=-77.962589
-SteRd http://www.openstreetmap.org/?lat=40.834066&lon=-77.934780
+PA453/45Trk http://www.openstreetmap.org/?lat=40.665263&lon=-78.223906
+RidRd_S http://www.openstreetmap.org/?lat=40.676985&lon=-78.201778
+StiRd http://www.openstreetmap.org/?lat=40.689244&lon=-78.176265
+HunSprRd http://www.openstreetmap.org/?lat=40.694478&lon=-78.149059
+PA350/45Trk http://www.openstreetmap.org/?lat=40.703149&lon=-78.129326
+DunRd http://www.openstreetmap.org/?lat=40.714903&lon=-78.110028
+RidRd_N http://www.openstreetmap.org/?lat=40.722897&lon=-78.118313
+LovRd http://www.openstreetmap.org/?lat=40.755476&lon=-78.068480
+BecRd http://www.openstreetmap.org/?lat=40.778098&lon=-78.041999
+MeeLn http://www.openstreetmap.org/?lat=40.820161&lon=-77.974973
+AthSt http://www.openstreetmap.org/?lat=40.828411&lon=-77.962621
+SteRd http://www.openstreetmap.org/?lat=40.834061&lon=-77.934710
 JulPk http://www.openstreetmap.org/?lat=40.834611&lon=-77.929746
 BerRd http://www.openstreetmap.org/?lat=40.853579&lon=-77.886275
 FilRd http://www.openstreetmap.org/?lat=40.859077&lon=-77.876372
+RockRd http://www.openstreetmap.org/?lat=40.874858&lon=-77.847254
+SnoLn http://www.openstreetmap.org/?lat=40.891792&lon=-77.815993
 SprCreRd http://www.openstreetmap.org/?lat=40.900869&lon=-77.798993
 PA150_S http://www.openstreetmap.org/?lat=40.905366&lon=-77.786089
 MillSt http://www.openstreetmap.org/?lat=40.908163&lon=-77.781505
 PA150_N http://www.openstreetmap.org/?lat=40.911498&lon=-77.780607
 PA144_N http://www.openstreetmap.org/?lat=40.912065&lon=-77.777892
-PA144_S http://www.openstreetmap.org/?lat=40.910780&lon=-77.777410
+PA144_S http://www.openstreetmap.org/?lat=40.910756&lon=-77.777412
 BlaSt http://www.openstreetmap.org/?lat=40.911802&lon=-77.772434
 I-99 http://www.openstreetmap.org/?lat=40.915312&lon=-77.741618
 MusLn http://www.openstreetmap.org/?lat=40.916216&lon=-77.725672
 ForAve http://www.openstreetmap.org/?lat=40.914696&lon=-77.684981
-PA64 http://www.openstreetmap.org/?lat=40.918941&lon=-77.676612
+PA64 http://www.openstreetmap.org/?lat=40.918182&lon=-77.677438
diff --git a/hwy_data/PA/usapa/pa.pa764.wpt b/hwy_data/PA/usapa/pa.pa764.wpt
index baae501a3d6..826e2437fff 100644
--- a/hwy_data/PA/usapa/pa.pa764.wpt
+++ b/hwy_data/PA/usapa/pa.pa764.wpt
@@ -12,4 +12,4 @@ KetSt http://www.openstreetmap.org/?lat=40.520924&lon=-78.377943
 PotRd http://www.openstreetmap.org/?lat=40.529758&lon=-78.365661
 US220Bus_S http://www.openstreetmap.org/?lat=40.530151&lon=-78.362748
 US220Bus_N http://www.openstreetmap.org/?lat=40.565830&lon=-78.337624
-I-99 http://www.openstreetmap.org/?lat=40.562154&lon=-78.328477
+I-99 http://www.openstreetmap.org/?lat=40.562165&lon=-78.328480
diff --git a/hwy_data/PA/usapa/pa.pa866.wpt b/hwy_data/PA/usapa/pa.pa866.wpt
index 542aec46433..58a81c3e51e 100644
--- a/hwy_data/PA/usapa/pa.pa866.wpt
+++ b/hwy_data/PA/usapa/pa.pa866.wpt
@@ -1,7 +1,18 @@
 PA36 http://www.openstreetmap.org/?lat=40.235648&lon=-78.362324
-PA164 https://www.openstreetmap.org/?lat=40.311301&lon=-78.325031
-RoyRd_S http://www.openstreetmap.org/?lat=40.419214&lon=-78.269734
-+X1 http://www.openstreetmap.org/?lat=40.432829&lon=-78.264112
-HighSt_N http://www.openstreetmap.org/?lat=40.462189&lon=-78.200855
-+X2 http://www.openstreetmap.org/?lat=40.488289&lon=-78.241560
+HenRd http://www.openstreetmap.org/?lat=40.271631&lon=-78.339968
+CoveLaneRd http://www.openstreetmap.org/?lat=40.286407&lon=-78.334158
+CroCoveRd http://www.openstreetmap.org/?lat=40.301984&lon=-78.329692
+PA164 http://www.openstreetmap.org/?lat=40.311346&lon=-78.325039
+SpoRd http://www.openstreetmap.org/?lat=40.370022&lon=-78.295878
+RoyMouRd http://www.openstreetmap.org/?lat=40.419886&lon=-78.269697
++X1 http://www.openstreetmap.org/?lat=40.432841&lon=-78.264147
+ShoCutRd http://www.openstreetmap.org/?lat=40.442838&lon=-78.233409
+HighSt_N http://www.openstreetmap.org/?lat=40.462244&lon=-78.200743
++X0R http://www.openstreetmap.org/?lat=40.469478&lon=-78.208867
++X1R http://www.openstreetmap.org/?lat=40.470288&lon=-78.221865
+LowPCRd http://www.openstreetmap.org/?lat=40.473818&lon=-78.225752
++X2R http://www.openstreetmap.org/?lat=40.479374&lon=-78.230113
++X3R http://www.openstreetmap.org/?lat=40.487903&lon=-78.239849
++X2 http://www.openstreetmap.org/?lat=40.488121&lon=-78.244468
++X4 http://www.openstreetmap.org/?lat=40.484296&lon=-78.248400
 US22 http://www.openstreetmap.org/?lat=40.484494&lon=-78.249307
diff --git a/hwy_data/PA/usapa/pa.pa867.wpt b/hwy_data/PA/usapa/pa.pa867.wpt
index badd00150db..22916916f84 100644
--- a/hwy_data/PA/usapa/pa.pa867.wpt
+++ b/hwy_data/PA/usapa/pa.pa867.wpt
@@ -1,3 +1,8 @@
-PA869 https://www.openstreetmap.org/?lat=40.179603&lon=-78.471243
-PA868 https://www.openstreetmap.org/?lat=40.249554&lon=-78.422706
-PA36/164 https://www.openstreetmap.org/?lat=40.342034&lon=-78.403062
+PA869 http://www.openstreetmap.org/?lat=40.179599&lon=-78.471195
+SnyCreRd http://www.openstreetmap.org/?lat=40.216248&lon=-78.440307
+PA868 http://www.openstreetmap.org/?lat=40.249488&lon=-78.422730
+SprMouRd http://www.openstreetmap.org/?lat=40.285402&lon=-78.417224
+MainSt_S http://www.openstreetmap.org/?lat=40.331822&lon=-78.402380
+SpaSt http://www.openstreetmap.org/?lat=40.333605&lon=-78.402839
+MainSt_E http://www.openstreetmap.org/?lat=40.336353&lon=-78.403907
+PA36/164 http://www.openstreetmap.org/?lat=40.342139&lon=-78.403080
diff --git a/hwy_data/PA/usapa/pa.pa867trkroa.wpt b/hwy_data/PA/usapa/pa.pa867trkroa.wpt
new file mode 100644
index 00000000000..198e63d724d
--- /dev/null
+++ b/hwy_data/PA/usapa/pa.pa867trkroa.wpt
@@ -0,0 +1,16 @@
+SprMouRd http://www.openstreetmap.org/?lat=40.285402&lon=-78.417224
+PA868 http://www.openstreetmap.org/?lat=40.249488&lon=-78.422730
+SnyCreRd http://www.openstreetmap.org/?lat=40.216248&lon=-78.440307
+PA867_S http://www.openstreetmap.org/?lat=40.179599&lon=-78.471195
++X7 http://www.openstreetmap.org/?lat=40.167175&lon=-78.494117
+KauHolRd http://www.openstreetmap.org/?lat=40.146036&lon=-78.507620
+I-99(7) http://www.openstreetmap.org/?lat=40.146708&lon=-78.510101
+I-99(10) http://www.openstreetmap.org/?lat=40.193539&lon=-78.487154
++X111 http://www.openstreetmap.org/?lat=40.234466&lon=-78.463473
+I-99(15) http://www.openstreetmap.org/?lat=40.258485&lon=-78.456794
++X01 http://www.openstreetmap.org/?lat=40.335680&lon=-78.429508
+I-99(23) http://www.openstreetmap.org/?lat=40.369438&lon=-78.435696
+US220Bus/164 http://www.openstreetmap.org/?lat=40.368252&lon=-78.429787
+PA36_N http://www.openstreetmap.org/?lat=40.366949&lon=-78.426520
+FreSt http://www.openstreetmap.org/?lat=40.361071&lon=-78.419080
+PA867_N http://www.openstreetmap.org/?lat=40.342139&lon=-78.403080
diff --git a/hwy_data/PA/usapa/pa.pa868.wpt b/hwy_data/PA/usapa/pa.pa868.wpt
index 6d37b7343ea..0568aad2135 100644
--- a/hwy_data/PA/usapa/pa.pa868.wpt
+++ b/hwy_data/PA/usapa/pa.pa868.wpt
@@ -1,3 +1,4 @@
-PA36 https://www.openstreetmap.org/?lat=40.189807&lon=-78.376057
-RepSchRd http://www.openstreetmap.org/?lat=40.198617&lon=-78.392816
-PA867 https://www.openstreetmap.org/?lat=40.249554&lon=-78.422706
+PA36 http://www.openstreetmap.org/?lat=40.189705&lon=-78.376052
+RepSchRd http://www.openstreetmap.org/?lat=40.198605&lon=-78.392845
+SnyCreRd http://www.openstreetmap.org/?lat=40.223165&lon=-78.413654
+PA867 http://www.openstreetmap.org/?lat=40.249488&lon=-78.422730
diff --git a/hwy_data/PA/usapa/pa.pa869.wpt b/hwy_data/PA/usapa/pa.pa869.wpt
index 76d59a5e47b..adc97ec7111 100644
--- a/hwy_data/PA/usapa/pa.pa869.wpt
+++ b/hwy_data/PA/usapa/pa.pa869.wpt
@@ -1,23 +1,33 @@
 US219 http://www.openstreetmap.org/?lat=40.344453&lon=-78.780580
+AbuRd http://www.openstreetmap.org/?lat=40.341262&lon=-78.777080
 +X0R http://www.openstreetmap.org/?lat=40.335071&lon=-78.767585
 WPARd http://www.openstreetmap.org/?lat=40.332914&lon=-78.763580
+LakeRd http://www.openstreetmap.org/?lat=40.333169&lon=-78.759428
 PA160_S http://www.openstreetmap.org/?lat=40.329714&lon=-78.746969
 PA160_N http://www.openstreetmap.org/?lat=40.330783&lon=-78.742940
-+X1 http://www.openstreetmap.org/?lat=40.318537&lon=-78.723961
-CedSt_N http://www.openstreetmap.org/?lat=40.321093&lon=-78.697343
++X1 http://www.openstreetmap.org/?lat=40.318557&lon=-78.723953
+CedSt_N http://www.openstreetmap.org/?lat=40.321078&lon=-78.697179
+CamAve_N http://www.openstreetmap.org/?lat=40.319273&lon=-78.698727
 CamAve_S http://www.openstreetmap.org/?lat=40.314428&lon=-78.693910
-+X3 http://www.openstreetmap.org/?lat=40.306261&lon=-78.678975
-+X4 http://www.openstreetmap.org/?lat=40.307406&lon=-78.648870
-+X5 http://www.openstreetmap.org/?lat=40.286573&lon=-78.618207
-+X6 http://www.openstreetmap.org/?lat=40.266977&lon=-78.616705
-MonRd http://www.openstreetmap.org/?lat=40.263899&lon=-78.589990
+SteAve http://www.openstreetmap.org/?lat=40.306247&lon=-78.678989
++X4 http://www.openstreetmap.org/?lat=40.307376&lon=-78.648875
++X5 http://www.openstreetmap.org/?lat=40.286571&lon=-78.618212
++X6 http://www.openstreetmap.org/?lat=40.266985&lon=-78.616697
+MonRd http://www.openstreetmap.org/?lat=40.263913&lon=-78.589990
 QueRd http://www.openstreetmap.org/?lat=40.257431&lon=-78.584569
-BurHillRd http://www.openstreetmap.org/?lat=40.243762&lon=-78.577547
+BurHillRd http://www.openstreetmap.org/?lat=40.243760&lon=-78.577539
 PA96 http://www.openstreetmap.org/?lat=40.213448&lon=-78.559542
 MowMilRd http://www.openstreetmap.org/?lat=40.211238&lon=-78.555438
-CovBriRd http://www.openstreetmap.org/?lat=40.177094&lon=-78.540981
-WilPennRd http://www.openstreetmap.org/?lat=40.168536&lon=-78.517807
-I-99 http://www.openstreetmap.org/?lat=40.146708&lon=-78.510017
+CovBriRd http://www.openstreetmap.org/?lat=40.177103&lon=-78.540962
+ShoCutRd http://www.openstreetmap.org/?lat=40.170190&lon=-78.522535
+LumSt http://www.openstreetmap.org/?lat=40.170173&lon=-78.519598
+WilPennRd_N +WilPennRd http://www.openstreetmap.org/?lat=40.168735&lon=-78.517758
+WhiPineRd http://www.openstreetmap.org/?lat=40.155401&lon=-78.512453
+WilPennRd_S http://www.openstreetmap.org/?lat=40.147594&lon=-78.511873
+I-99 http://www.openstreetmap.org/?lat=40.146708&lon=-78.510101
+KauHolRd http://www.openstreetmap.org/?lat=40.146036&lon=-78.507620
 +X7 http://www.openstreetmap.org/?lat=40.167175&lon=-78.494117
-PA867 http://www.openstreetmap.org/?lat=40.179603&lon=-78.471243
-PA36 http://www.openstreetmap.org/?lat=40.172508&lon=-78.379437
+PA867 http://www.openstreetmap.org/?lat=40.179599&lon=-78.471195
+SalRd http://www.openstreetmap.org/?lat=40.175631&lon=-78.458535
+RepSchRd http://www.openstreetmap.org/?lat=40.170274&lon=-78.408246
+PA36 http://www.openstreetmap.org/?lat=40.172530&lon=-78.379445
diff --git a/hwy_data/PA/usaus/pa.us022.wpt b/hwy_data/PA/usaus/pa.us022.wpt
index f5301768c82..702007d504b 100644
--- a/hwy_data/PA/usaus/pa.us022.wpt
+++ b/hwy_data/PA/usaus/pa.us022.wpt
@@ -98,6 +98,7 @@ ScoValRd http://www.openstreetmap.org/?lat=40.432937&lon=-78.378203
 OldUS22_A http://www.openstreetmap.org/?lat=40.432574&lon=-78.367227
 FraRd http://www.openstreetmap.org/?lat=40.444222&lon=-78.353811
 TurValRd http://www.openstreetmap.org/?lat=40.472583&lon=-78.281354
++X866R http://www.openstreetmap.org/?lat=40.484345&lon=-78.253706
 PA866 http://www.openstreetmap.org/?lat=40.484494&lon=-78.249307
 +X205 http://www.openstreetmap.org/?lat=40.495114&lon=-78.244736
 YelSprDr http://www.openstreetmap.org/?lat=40.517343&lon=-78.206335
@@ -202,6 +203,7 @@ I-78(40) http://www.openstreetmap.org/?lat=40.577380&lon=-75.798714
 +X22B http://www.openstreetmap.org/?lat=40.576044&lon=-75.767231
 +X22A http://www.openstreetmap.org/?lat=40.581417&lon=-75.724747
 I-78(45) http://www.openstreetmap.org/?lat=40.580126&lon=-75.707753
++X(I-78(48)) http://www.openstreetmap.org/?lat=40.575475&lon=-75.658357
 +X23 http://www.openstreetmap.org/?lat=40.575115&lon=-75.652625
 I-78(49) http://www.openstreetmap.org/?lat=40.579919&lon=-75.624339
 I-78(51) http://www.openstreetmap.org/?lat=40.589091&lon=-75.590401
diff --git a/hwy_data/PA/usaus/pa.us220.wpt b/hwy_data/PA/usaus/pa.us220.wpt
index cddd3321218..362d875de98 100644
--- a/hwy_data/PA/usaus/pa.us220.wpt
+++ b/hwy_data/PA/usaus/pa.us220.wpt
@@ -1,51 +1,59 @@
-MD/PA http://www.openstreetmap.org/?lat=39.722801&lon=-78.706055
-ValRd http://www.openstreetmap.org/?lat=39.730368&lon=-78.712320
-BlaWalRd http://www.openstreetmap.org/?lat=39.792149&lon=-78.678632
-WhiChuLn http://www.openstreetmap.org/?lat=39.830381&lon=-78.646510
-EviCreRd http://www.openstreetmap.org/?lat=39.873335&lon=-78.610740
-TexEasRd http://www.openstreetmap.org/?lat=39.932611&lon=-78.585291
+MD/PA http://www.openstreetmap.org/?lat=39.722855&lon=-78.706414
+ValRd http://www.openstreetmap.org/?lat=39.730360&lon=-78.712283
+LakeGorRd http://www.openstreetmap.org/?lat=39.757061&lon=-78.697265
+NarLn http://www.openstreetmap.org/?lat=39.793738&lon=-78.677291
+WhiChuLn http://www.openstreetmap.org/?lat=39.830365&lon=-78.646523
+EviCreRd http://www.openstreetmap.org/?lat=39.873348&lon=-78.610726
+BroRd http://www.openstreetmap.org/?lat=39.940578&lon=-78.578264
 US220BusBed_S http://www.openstreetmap.org/?lat=39.959408&lon=-78.562277
++X1(US220) http://www.openstreetmap.org/?lat=39.998813&lon=-78.527079
 US30Bus http://www.openstreetmap.org/?lat=40.022122&lon=-78.514929
 US30 http://www.openstreetmap.org/?lat=40.025990&lon=-78.513569
-I-99(1) http://www.openstreetmap.org/?lat=40.055936&lon=-78.518107
+I-99(1) http://www.openstreetmap.org/?lat=40.055909&lon=-78.518112
 +X110 http://www.openstreetmap.org/?lat=40.087214&lon=-78.529343
 I-99(3) http://www.openstreetmap.org/?lat=40.095990&lon=-78.529194
-I-99(7) http://www.openstreetmap.org/?lat=40.146708&lon=-78.510017
-I-99(10) http://www.openstreetmap.org/?lat=40.193562&lon=-78.487143
+I-99(7) http://www.openstreetmap.org/?lat=40.146708&lon=-78.510101
+I-99(10) http://www.openstreetmap.org/?lat=40.193539&lon=-78.487154
 +X111 http://www.openstreetmap.org/?lat=40.234466&lon=-78.463473
 I-99(15) http://www.openstreetmap.org/?lat=40.258485&lon=-78.456794
-+X01 http://www.openstreetmap.org/?lat=40.335684&lon=-78.429594
-I-99(23) http://www.openstreetmap.org/?lat=40.369370&lon=-78.435645
++X01 http://www.openstreetmap.org/?lat=40.335680&lon=-78.429508
+I-99(23) http://www.openstreetmap.org/?lat=40.369438&lon=-78.435696
++X01C http://www.openstreetmap.org/?lat=40.388581&lon=-78.428805
++X01A http://www.openstreetmap.org/?lat=40.411266&lon=-78.433215
++X01B http://www.openstreetmap.org/?lat=40.421787&lon=-78.423430
 I-99(28) http://www.openstreetmap.org/?lat=40.439435&lon=-78.426933
-+X02 http://www.openstreetmap.org/?lat=40.462589&lon=-78.422363
++X02 http://www.openstreetmap.org/?lat=40.462475&lon=-78.422151
 I-99(31) http://www.openstreetmap.org/?lat=40.465518&lon=-78.407864
 +X112 http://www.openstreetmap.org/?lat=40.470643&lon=-78.398993
 I-99(32) http://www.openstreetmap.org/?lat=40.479435&lon=-78.394189
-I-99(33) http://www.openstreetmap.org/?lat=40.493404&lon=-78.383503
-I-99(39) http://www.openstreetmap.org/?lat=40.562154&lon=-78.328477
+I-99(33) http://www.openstreetmap.org/?lat=40.493392&lon=-78.383479
+I-99(39) http://www.openstreetmap.org/?lat=40.562165&lon=-78.328480
 I-99(41) http://www.openstreetmap.org/?lat=40.598792&lon=-78.314694
-I-99(45) http://www.openstreetmap.org/?lat=40.641735&lon=-78.270850
++X02A http://www.openstreetmap.org/?lat=40.614203&lon=-78.305448
+I-99(45) http://www.openstreetmap.org/?lat=40.641798&lon=-78.270939
 I-99(48) http://www.openstreetmap.org/?lat=40.670801&lon=-78.235016
 +X4 http://www.openstreetmap.org/?lat=40.699121&lon=-78.213258
-I-99(52) http://www.openstreetmap.org/?lat=40.711011&lon=-78.188367
+I-99(52) http://www.openstreetmap.org/?lat=40.710983&lon=-78.188539
 +X5 http://www.openstreetmap.org/?lat=40.723258&lon=-78.146009
++X5A http://www.openstreetmap.org/?lat=40.747680&lon=-78.106050
 +X6 http://www.openstreetmap.org/?lat=40.784408&lon=-78.067431
 I-99(61) http://www.openstreetmap.org/?lat=40.804024&lon=-78.063697
 I-99(62) http://www.openstreetmap.org/?lat=40.809278&lon=-78.056939
++X6A http://www.openstreetmap.org/?lat=40.810348&lon=-78.034365
 *AthSt http://www.openstreetmap.org/?lat=40.833295&lon=-77.968855
-I-99(68) http://www.openstreetmap.org/?lat=40.818210&lon=-77.939823
+I-99(68) http://www.openstreetmap.org/?lat=40.818210&lon=-77.939871
 I-99(69) http://www.openstreetmap.org/?lat=40.815563&lon=-77.928343
 I-99(69A) http://www.openstreetmap.org/?lat=40.815465&lon=-77.918644
-I-99(71) http://www.openstreetmap.org/?lat=40.818828&lon=-77.900619
+I-99(71) http://www.openstreetmap.org/?lat=40.818791&lon=-77.900711
 I-99(73) http://www.openstreetmap.org/?lat=40.825582&lon=-77.843971
 I-99(74) http://www.openstreetmap.org/?lat=40.834755&lon=-77.835582
-I-99(76) http://www.openstreetmap.org/?lat=40.846508&lon=-77.811935
+I-99(76) http://www.openstreetmap.org/?lat=40.846496&lon=-77.811989
 I-99(78) http://www.openstreetmap.org/?lat=40.872604&lon=-77.778651
-I-99(80) http://www.openstreetmap.org/?lat=40.884415&lon=-77.740309
+I-99(80) http://www.openstreetmap.org/?lat=40.884411&lon=-77.740331
 I-99(81) http://www.openstreetmap.org/?lat=40.889526&lon=-77.732735
 I-99(83) http://www.openstreetmap.org/?lat=40.915312&lon=-77.741618
-MusLn http://www.openstreetmap.org/?lat=40.938463&lon=-77.730675
-JacRd http://www.openstreetmap.org/?lat=40.940040&lon=-77.728977
+MusLn http://www.openstreetmap.org/?lat=40.938460&lon=-77.730723
+JacRd_S  +JacRd http://www.openstreetmap.org/?lat=40.940046&lon=-77.728966
 I-80(161) http://www.openstreetmap.org/?lat=40.944833&lon=-77.720160
 +X113 http://www.openstreetmap.org/?lat=40.970437&lon=-77.638321
 +X114 http://www.openstreetmap.org/?lat=41.017022&lon=-77.582788
diff --git a/hwy_data/PA/usaus/pa.us322.wpt b/hwy_data/PA/usaus/pa.us322.wpt
index bfef53d2f73..ad12cb3dac0 100644
--- a/hwy_data/PA/usaus/pa.us322.wpt
+++ b/hwy_data/PA/usaus/pa.us322.wpt
@@ -93,18 +93,19 @@ HanFurRd http://www.openstreetmap.org/?lat=40.851132&lon=-78.152396
 MouRd http://www.openstreetmap.org/?lat=40.824462&lon=-78.101463
 LauRunRd http://www.openstreetmap.org/?lat=40.811195&lon=-78.072324
 I-99(62) http://www.openstreetmap.org/?lat=40.809278&lon=-78.056939
++X6A(I-99) http://www.openstreetmap.org/?lat=40.810348&lon=-78.034365
 *AthSt http://www.openstreetmap.org/?lat=40.833295&lon=-77.968855
-I-99(68) http://www.openstreetmap.org/?lat=40.818210&lon=-77.939823
+I-99(68) http://www.openstreetmap.org/?lat=40.818210&lon=-77.939871
 I-99(69) http://www.openstreetmap.org/?lat=40.815563&lon=-77.928343
 I-99(69A) http://www.openstreetmap.org/?lat=40.815465&lon=-77.918644
-I-99(71) http://www.openstreetmap.org/?lat=40.818828&lon=-77.900619
+I-99(71) http://www.openstreetmap.org/?lat=40.818791&lon=-77.900711
 I-99(73) http://www.openstreetmap.org/?lat=40.825582&lon=-77.843971
 PA26 http://www.openstreetmap.org/?lat=40.812104&lon=-77.828479
 +X16 http://www.openstreetmap.org/?lat=40.803204&lon=-77.827191
 +X17 http://www.openstreetmap.org/?lat=40.792418&lon=-77.815819
 BoaRd http://www.openstreetmap.org/?lat=40.789640&lon=-77.799039
-PA45 http://www.openstreetmap.org/?lat=40.781321&lon=-77.779770
-US322BusSta_E http://www.openstreetmap.org/?lat=40.779372&lon=-77.775521
+PA45 http://www.openstreetmap.org/?lat=40.781323&lon=-77.779724
+US322BusSta_E http://www.openstreetmap.org/?lat=40.779270&lon=-77.775527
 BearMeaRd http://www.openstreetmap.org/?lat=40.779418&lon=-77.759500
 ShaRd http://www.openstreetmap.org/?lat=40.781721&lon=-77.733445
 WagRd http://www.openstreetmap.org/?lat=40.792198&lon=-77.700441
diff --git a/hwy_data/PA/usausb/pa.us220busalt.wpt b/hwy_data/PA/usausb/pa.us220busalt.wpt
index a81f9f2ab10..8c7f5102dc5 100644
--- a/hwy_data/PA/usausb/pa.us220busalt.wpt
+++ b/hwy_data/PA/usausb/pa.us220busalt.wpt
@@ -1,5 +1,7 @@
 US220 +US220_S http://www.openstreetmap.org/?lat=40.258485&lon=-78.456794
+WilPennRd http://www.openstreetmap.org/?lat=40.259995&lon=-78.460024
 QuaRd http://www.openstreetmap.org/?lat=40.272243&lon=-78.460380
+SkiGapRd http://www.openstreetmap.org/?lat=40.291851&lon=-78.455188
 PolRd http://www.openstreetmap.org/?lat=40.312385&lon=-78.447584
 PA164_W http://www.openstreetmap.org/?lat=40.356730&lon=-78.430270
 PA164_E http://www.openstreetmap.org/?lat=40.368252&lon=-78.429787
diff --git a/hwy_data/PA/usausb/pa.us322bussta.wpt b/hwy_data/PA/usausb/pa.us322bussta.wpt
index 8ba054fb858..f58f0a8ec30 100644
--- a/hwy_data/PA/usausb/pa.us322bussta.wpt
+++ b/hwy_data/PA/usausb/pa.us322bussta.wpt
@@ -1,7 +1,11 @@
 US322_W http://www.openstreetmap.org/?lat=40.815563&lon=-77.928343
-ValVisDr http://www.openstreetmap.org/?lat=40.812250&lon=-77.922506
-VaiBlvd http://www.openstreetmap.org/?lat=40.808050&lon=-77.895250
-PA26 https://www.openstreetmap.org/?lat=40.791362&lon=-77.864410
-PA45_W http://www.openstreetmap.org/?lat=40.781126&lon=-77.801099
-PA45_E http://www.openstreetmap.org/?lat=40.776869&lon=-77.787924
-US322_E https://www.openstreetmap.org/?lat=40.779372&lon=-77.775521
+ValVisDr http://www.openstreetmap.org/?lat=40.812074&lon=-77.922474
+VaiBlvd http://www.openstreetmap.org/?lat=40.807944&lon=-77.895271
+BlueCouDr http://www.openstreetmap.org/?lat=40.803630&lon=-77.884196
+ParkAve http://www.openstreetmap.org/?lat=40.796777&lon=-77.872454
+PA26 http://www.openstreetmap.org/?lat=40.791327&lon=-77.864453
+WesPkwy http://www.openstreetmap.org/?lat=40.785310&lon=-77.851835
+UniDr http://www.openstreetmap.org/?lat=40.785286&lon=-77.837081
+PA45_W http://www.openstreetmap.org/?lat=40.781110&lon=-77.801080
+PA45_E http://www.openstreetmap.org/?lat=40.776751&lon=-77.787937
+US322_E http://www.openstreetmap.org/?lat=40.779270&lon=-77.775527
diff --git a/hwy_data/_systems/usapa.csv b/hwy_data/_systems/usapa.csv
index 79d007164d1..f66d0a4d9ff 100644
--- a/hwy_data/_systems/usapa.csv
+++ b/hwy_data/_systems/usapa.csv
@@ -458,6 +458,7 @@ usapa;PA;PA864;;;;pa.pa864;
 usapa;PA;PA865;;;;pa.pa865;
 usapa;PA;PA866;;;;pa.pa866;
 usapa;PA;PA867;;;;pa.pa867;
+usapa;PA;PA867;Trk;Roa;Roaring Spring;pa.pa867trkroa;
 usapa;PA;PA868;;;;pa.pa868;
 usapa;PA;PA869;;;;pa.pa869;
 usapa;PA;PA872;;;;pa.pa872;
diff --git a/hwy_data/_systems/usapa_con.csv b/hwy_data/_systems/usapa_con.csv
index 13dccf822de..1317c8b67ff 100644
--- a/hwy_data/_systems/usapa_con.csv
+++ b/hwy_data/_systems/usapa_con.csv
@@ -456,6 +456,7 @@ usapa;PA864;;;pa.pa864
 usapa;PA865;;;pa.pa865
 usapa;PA866;;;pa.pa866
 usapa;PA867;;;pa.pa867
+usapa;PA867;Trk;Roaring Spring;pa.pa867trkroa
 usapa;PA868;;;pa.pa868
 usapa;PA869;;;pa.pa869
 usapa;PA872;;;pa.pa872
diff --git a/updates.csv b/updates.csv
index bf515ad7bb3..b4bfea23bfa 100644
--- a/updates.csv
+++ b/updates.csv
@@ -3342,6 +3342,7 @@
 2017-09-06;(USA) Oregon;OR 99;or.or099;Restored route from I-5 onto Yoncalla-Drain routing.
 2017-09-06;(USA) Oregon;OR 99W;or.or099w;Truncated route from I-5(306) to I-5(294) to reflect signage and prepare for Oregon Highways dataset.
 2017-09-06;(USA) Oregon;OR 126;or.or126;Moved route from Bus 97 to US 97 in Redmond.
+2019-12-13;(USA) Pennsylvania;PA 867 Truck (Roaring Spring);pa.pa867trkroa;Route added.
 2019-11-19;(USA) Pennsylvania;PA 154;pa.pa154;Fixed route so that labels go from south (US 220) to north (PA 414).
 2019-11-09;(USA) Pennsylvania;PA 662;pa.pa662;Realigned between *OldPA662_A and *OldPA662_B as a result of a roundabout recently opened at PA73_E.
 2019-11-09;(USA) Pennsylvania;PA 152;pa.pa152;Realigned between *OldPA152 and where it leaves County Line Rd (CouLineRd_W) northbound.