diff --git a/hwy_data/IA/usaus/ia.us061.wpt b/hwy_data/IA/usaus/ia.us061.wpt
index ccc2e0d22f4..e0616fb425a 100644
--- a/hwy_data/IA/usaus/ia.us061.wpt
+++ b/hwy_data/IA/usaus/ia.us061.wpt
@@ -102,7 +102,7 @@ MaqDr http://www.openstreetmap.org/?lat=42.454577&lon=-90.677916
 US52_S http://www.openstreetmap.org/?lat=42.459434&lon=-90.673041
 187 +GraAve http://www.openstreetmap.org/?lat=42.478008&lon=-90.668085
 188 +IA946_S http://www.openstreetmap.org/?lat=42.484380&lon=-90.663839
-+X10 http://www.openstreetmap.org/?lat=42.488125&lon=-90.660032
++X13 http://www.openstreetmap.org/?lat=42.488125&lon=-90.660032
 IA946_N http://www.openstreetmap.org/?lat=42.494386&lon=-90.662677
 189A +WhiSt +4thSt http://www.openstreetmap.org/?lat=42.498255&lon=-90.663006
 189B +9th/11thSt +US52/3 http://www.openstreetmap.org/?lat=42.504724&lon=-90.660467
diff --git a/hwy_data/IL/usai/il.i055.wpt b/hwy_data/IL/usai/il.i055.wpt
index 2b17d65f919..3b8ce76551a 100644
--- a/hwy_data/IL/usai/il.i055.wpt
+++ b/hwy_data/IL/usai/il.i055.wpt
@@ -98,7 +98,8 @@ MO/IL +0 http://www.openstreetmap.org/?lat=38.618076&lon=-90.182693
 238 http://www.openstreetmap.org/?lat=41.314692&lon=-88.192062
 240 http://www.openstreetmap.org/?lat=41.343986&lon=-88.191547
 241 http://www.openstreetmap.org/?lat=41.352137&lon=-88.191719
-245 http://www.openstreetmap.org/?lat=41.418466&lon=-88.194466
+244 http://www.openstreetmap.org/?lat=41.397930&lon=-88.193092
+*245 http://www.openstreetmap.org/?lat=41.418466&lon=-88.194466
 247 http://www.openstreetmap.org/?lat=41.434555&lon=-88.195024
 248 http://www.openstreetmap.org/?lat=41.456076&lon=-88.195882
 250 http://www.openstreetmap.org/?lat=41.486270&lon=-88.197470
@@ -133,4 +134,4 @@ MO/IL +0 http://www.openstreetmap.org/?lat=38.618076&lon=-90.182693
 293A http://www.openstreetmap.org/?lat=41.847314&lon=-87.631116
 293C http://www.openstreetmap.org/?lat=41.847858&lon=-87.623649
 293D http://www.openstreetmap.org/?lat=41.848018&lon=-87.617469
-US41 +999 http://www.openstreetmap.org/?lat=41.848817&lon=-87.612534
+US41 +999 http://www.openstreetmap.org/?lat=41.848817&lon=-87.612534
\ No newline at end of file
diff --git a/hwy_data/IL/usai/il.i057.wpt b/hwy_data/IL/usai/il.i057.wpt
index 7ae77d1caaf..2e9b5f7e584 100644
--- a/hwy_data/IL/usai/il.i057.wpt
+++ b/hwy_data/IL/usai/il.i057.wpt
@@ -17,7 +17,8 @@ MO/IL +0 http://www.openstreetmap.org/?lat=37.023663&lon=-89.211388
 45 http://www.openstreetmap.org/?lat=37.621574&lon=-88.987498
 +X07 http://www.openstreetmap.org/?lat=37.678148&lon=-88.966255
 53 http://www.openstreetmap.org/?lat=37.729860&lon=-88.958745
-54 http://www.openstreetmap.org/?lat=37.740483&lon=-88.958316
+54A +54 http://www.openstreetmap.org/?lat=37.740483&lon=-88.958316
+54B http://www.openstreetmap.org/?lat=37.744827&lon=-88.956728
 +X08 http://www.openstreetmap.org/?lat=37.775091&lon=-88.945827
 59 http://www.openstreetmap.org/?lat=37.816633&lon=-88.945913
 65 http://www.openstreetmap.org/?lat=37.897750&lon=-88.946300
diff --git a/hwy_data/IL/usail/il.il078.wpt b/hwy_data/IL/usail/il.il078.wpt
index 479b6d97fbd..cc756dab6b2 100644
--- a/hwy_data/IL/usail/il.il078.wpt
+++ b/hwy_data/IL/usail/il.il078.wpt
@@ -1,6 +1,6 @@
 IL104 http://www.openstreetmap.org/?lat=39.751644&lon=-90.277963
-+X01 http://www.openstreetmap.org/?lat=39.752073&lon=-90.267577
-+X02 http://www.openstreetmap.org/?lat=39.745342&lon=-90.264831
+PoorFarmRd http://www.openstreetmap.org/?lat=39.751677&lon=-90.266740
++X02 http://www.openstreetmap.org/?lat=39.745392&lon=-90.265195
 MainSt_S http://www.openstreetmap.org/?lat=39.745243&lon=-90.229125
 +X03 http://www.openstreetmap.org/?lat=39.782718&lon=-90.229039
 +X04 http://www.openstreetmap.org/?lat=39.791886&lon=-90.221615
diff --git a/hwy_data/IL/usail/il.il092.wpt b/hwy_data/IL/usail/il.il092.wpt
index daaa11e0a12..a5c0f2888e7 100644
--- a/hwy_data/IL/usail/il.il092.wpt
+++ b/hwy_data/IL/usail/il.il092.wpt
@@ -7,7 +7,7 @@ IL192 http://www.openstreetmap.org/?lat=41.401439&lon=-90.810585
 CRTT_E http://www.openstreetmap.org/?lat=41.431595&lon=-90.810585
 +X04 http://www.openstreetmap.org/?lat=41.441407&lon=-90.797367
 CRH http://www.openstreetmap.org/?lat=41.439139&lon=-90.719175
-AndRd http://www.openstreetmap.org/?lat=41.443820&lon=-90.620556
+CenExpy_S +AndRd http://www.openstreetmap.org/?lat=41.443820&lon=-90.620556
 I-280 http://www.openstreetmap.org/?lat=41.463794&lon=-90.614591
 31stAve http://www.openstreetmap.org/?lat=41.483344&lon=-90.601931
 18thAve http://www.openstreetmap.org/?lat=41.494146&lon=-90.593219
@@ -40,4 +40,4 @@ IL26 http://www.openstreetmap.org/?lat=41.552944&lon=-89.461584
 CR2 http://www.openstreetmap.org/?lat=41.553683&lon=-89.354038
 +X07 http://www.openstreetmap.org/?lat=41.553779&lon=-89.312925
 +X08 http://www.openstreetmap.org/?lat=41.539101&lon=-89.291253
-US34 http://www.openstreetmap.org/?lat=41.538747&lon=-89.276319
+US34 http://www.openstreetmap.org/?lat=41.538747&lon=-89.276319
\ No newline at end of file
diff --git a/hwy_data/IL/usail/il.il097.wpt b/hwy_data/IL/usail/il.il097.wpt
index 4a0878aa3d1..cd957782df2 100644
--- a/hwy_data/IL/usail/il.il097.wpt
+++ b/hwy_data/IL/usail/il.il097.wpt
@@ -41,6 +41,7 @@ IL116 http://www.openstreetmap.org/?lat=40.705986&lon=-90.157671
 +X19 http://www.openstreetmap.org/?lat=40.771442&lon=-90.157456
 IL8 http://www.openstreetmap.org/?lat=40.779079&lon=-90.148745
 CR20 http://www.openstreetmap.org/?lat=40.800654&lon=-90.165009
-+X20 http://www.openstreetmap.org/?lat=40.863972&lon=-90.213203
+CR12 http://www.openstreetmap.org/?lat=40.859201&lon=-90.210371
+CR21 http://www.openstreetmap.org/?lat=40.863972&lon=-90.213203
 +X21 http://www.openstreetmap.org/?lat=40.895608&lon=-90.250883
 US150 +US150_W +I-74 http://www.openstreetmap.org/?lat=40.906312&lon=-90.250883
\ No newline at end of file
diff --git a/hwy_data/IL/usail/il.il110.wpt b/hwy_data/IL/usail/il.il110.wpt
index 38f2dc62b40..6779484c4c3 100644
--- a/hwy_data/IL/usail/il.il110.wpt
+++ b/hwy_data/IL/usail/il.il110.wpt
@@ -28,6 +28,7 @@ CR5 http://www.openstreetmap.org/?lat=40.408399&lon=-90.937786
 IL61 http://www.openstreetmap.org/?lat=40.407451&lon=-90.888004
 US136_E http://www.openstreetmap.org/?lat=40.406691&lon=-90.855303
 +X33605a http://www.openstreetmap.org/?lat=40.406046&lon=-90.806808
+HunSt http://www.openstreetmap.org/?lat=40.411552&lon=-90.791284
 +X33606 http://www.openstreetmap.org/?lat=40.412026&lon=-90.766726
 +X33607 http://www.openstreetmap.org/?lat=40.423984&lon=-90.741234
 US136 http://www.openstreetmap.org/?lat=40.448229&lon=-90.738187
diff --git a/hwy_data/IL/usail/il.il117.wpt b/hwy_data/IL/usail/il.il117.wpt
index a0cf168aa1c..a7b2a47a6b0 100644
--- a/hwy_data/IL/usail/il.il117.wpt
+++ b/hwy_data/IL/usail/il.il117.wpt
@@ -1,5 +1,7 @@
 I-74 http://www.openstreetmap.org/?lat=40.622455&lon=-89.274859
 US150 http://www.openstreetmap.org/?lat=40.627699&lon=-89.274945
+LakeRd http://www.openstreetmap.org/?lat=40.702976&lon=-89.272649
+ReaDr http://www.openstreetmap.org/?lat=40.712118&lon=-89.272757
 US24 http://www.openstreetmap.org/?lat=40.721437&lon=-89.272842
 IL116_W http://www.openstreetmap.org/?lat=40.792596&lon=-89.273787
 CR4 http://www.openstreetmap.org/?lat=40.794286&lon=-89.199457
diff --git a/hwy_data/IL/usail/il.il336.wpt b/hwy_data/IL/usail/il.il336.wpt
index 4af87d36c97..65faeb8d04d 100644
--- a/hwy_data/IL/usail/il.il336.wpt
+++ b/hwy_data/IL/usail/il.il336.wpt
@@ -14,6 +14,8 @@ CR17 http://www.openstreetmap.org/?lat=40.414280&lon=-91.022758
 CR5 http://www.openstreetmap.org/?lat=40.408399&lon=-90.937786
 IL61 http://www.openstreetmap.org/?lat=40.407451&lon=-90.888004
 US136_E http://www.openstreetmap.org/?lat=40.406691&lon=-90.855303
++X05a http://www.openstreetmap.org/?lat=40.406046&lon=-90.806808
+HunSt http://www.openstreetmap.org/?lat=40.411552&lon=-90.791284
 +X06 http://www.openstreetmap.org/?lat=40.412026&lon=-90.766726
 +X07 http://www.openstreetmap.org/?lat=40.423984&lon=-90.741234
 US136 http://www.openstreetmap.org/?lat=40.448155&lon=-90.738487
diff --git a/hwy_data/IL/usaus/il.us034.wpt b/hwy_data/IL/usaus/il.us034.wpt
index f0e364dd535..08a93e27dcf 100644
--- a/hwy_data/IL/usaus/il.us034.wpt
+++ b/hwy_data/IL/usaus/il.us034.wpt
@@ -44,8 +44,11 @@ WestSt http://www.openstreetmap.org/?lat=41.365343&lon=-89.587498
 +X10 http://www.openstreetmap.org/?lat=41.371624&lon=-89.485745
 US6/26 http://www.openstreetmap.org/?lat=41.371753&lon=-89.465060
 IL26_N http://www.openstreetmap.org/?lat=41.384279&lon=-89.464974
-+X11 http://www.openstreetmap.org/?lat=41.384698&lon=-89.454117
-+X12 http://www.openstreetmap.org/?lat=41.436839&lon=-89.397254
+DovRd http://www.openstreetmap.org/?lat=41.384456&lon=-89.454385
+6thSt http://www.openstreetmap.org/?lat=41.387266&lon=-89.450555
+CR5 http://www.openstreetmap.org/?lat=41.422327&lon=-89.410987
+MarSt http://www.openstreetmap.org/?lat=41.436582&lon=-89.398241
+CR27 http://www.openstreetmap.org/?lat=41.436855&lon=-89.393574
 AngRd http://www.openstreetmap.org/?lat=41.437225&lon=-89.387598
 2950thSt http://www.openstreetmap.org/?lat=41.499996&lon=-89.286404
 IL89 http://www.openstreetmap.org/?lat=41.524387&lon=-89.281125
@@ -100,4 +103,4 @@ I-294 http://www.openstreetmap.org/?lat=41.818568&lon=-87.914314
 WolfRd http://www.openstreetmap.org/?lat=41.820711&lon=-87.899037
 US12/20 http://www.openstreetmap.org/?lat=41.817864&lon=-87.869725
 IL171 http://www.openstreetmap.org/?lat=41.816137&lon=-87.833848
-IL43 http://www.openstreetmap.org/?lat=41.823781&lon=-87.802691
+IL43 http://www.openstreetmap.org/?lat=41.823781&lon=-87.802691
\ No newline at end of file
diff --git a/hwy_data/IL/usaus/il.us067.wpt b/hwy_data/IL/usaus/il.us067.wpt
index 199680f0368..5863d409154 100644
--- a/hwy_data/IL/usaus/il.us067.wpt
+++ b/hwy_data/IL/usaus/il.us067.wpt
@@ -71,7 +71,7 @@ IL17 http://www.openstreetmap.org/?lat=41.203004&lon=-90.586910
 IL94 http://www.openstreetmap.org/?lat=41.392425&lon=-90.577941
 MilBlt http://www.openstreetmap.org/?lat=41.427959&lon=-90.567899
 10thAve http://www.openstreetmap.org/?lat=41.442668&lon=-90.567434
-1stAve http://www.openstreetmap.org/?lat=41.453149&lon=-90.567212
+1stAve_E +1stAve http://www.openstreetmap.org/?lat=41.453149&lon=-90.567212
 4thSt http://www.openstreetmap.org/?lat=41.453232&lon=-90.571799
 IL5 http://www.openstreetmap.org/?lat=41.466046&lon=-90.584078
 31stAve http://www.openstreetmap.org/?lat=41.479523&lon=-90.583073
diff --git a/hwy_data/IL/usaus/il.us150.wpt b/hwy_data/IL/usaus/il.us150.wpt
index 7cf899dd17d..69d347d964a 100644
--- a/hwy_data/IL/usaus/il.us150.wpt
+++ b/hwy_data/IL/usaus/il.us150.wpt
@@ -56,7 +56,7 @@ IL9_W http://www.openstreetmap.org/?lat=40.487726&lon=-89.058952
 I-55/74 http://www.openstreetmap.org/?lat=40.484919&lon=-89.028440
 MarSt_E http://www.openstreetmap.org/?lat=40.482732&lon=-89.011445
 LeeSt http://www.openstreetmap.org/?lat=40.486306&lon=-88.997712
-US51 http://www.openstreetmap.org/?lat=40.486453&lon=-88.994365
+US51Bus +US51 http://www.openstreetmap.org/?lat=40.486453&lon=-88.994365
 IL9_E http://www.openstreetmap.org/?lat=40.486485&lon=-88.984795
 OakAve_W http://www.openstreetmap.org/?lat=40.474048&lon=-88.984365
 OakAve_E http://www.openstreetmap.org/?lat=40.474016&lon=-88.978550
diff --git a/hwy_data/IL/usaush/il.us066hischi.wpt b/hwy_data/IL/usaush/il.us066hischi.wpt
index 85a2370fbdb..5b902967e50 100644
--- a/hwy_data/IL/usaush/il.us066hischi.wpt
+++ b/hwy_data/IL/usaush/il.us066hischi.wpt
@@ -96,6 +96,8 @@ LinSt_N http://www.openstreetmap.org/?lat=40.517698&lon=-88.982670
 FroRd http://www.openstreetmap.org/?lat=40.519101&lon=-88.968401
 SheDr_W http://www.openstreetmap.org/?lat=40.525038&lon=-88.967886
 I-55BL http://www.openstreetmap.org/?lat=40.529654&lon=-88.951578
+AirRd http://www.openstreetmap.org/?lat=40.547021&lon=-88.925056
++X01 http://www.openstreetmap.org/?lat=40.558548&lon=-88.907547
 CR65 http://www.openstreetmap.org/?lat=40.566698&lon=-88.899393
 JacSt http://www.openstreetmap.org/?lat=40.569323&lon=-88.891497
 CR12 http://www.openstreetmap.org/?lat=40.609497&lon=-88.831898
diff --git a/hwy_data/MO/usai/mo.i055.wpt b/hwy_data/MO/usai/mo.i055.wpt
index dabf46f6a1c..b002b229d5b 100644
--- a/hwy_data/MO/usai/mo.i055.wpt
+++ b/hwy_data/MO/usai/mo.i055.wpt
@@ -26,6 +26,7 @@ AR/MO +0 http://www.openstreetmap.org/?lat=35.999710&lon=-89.874641
 95 http://www.openstreetmap.org/?lat=37.286346&lon=-89.571619
 96 http://www.openstreetmap.org/?lat=37.302767&lon=-89.579473
 99 http://www.openstreetmap.org/?lat=37.348940&lon=-89.601531
+102 http://www.openstreetmap.org/?lat=37.382025&lon=-89.617581
 105 http://www.openstreetmap.org/?lat=37.428758&lon=-89.639643
 111 http://www.openstreetmap.org/?lat=37.500602&lon=-89.681826
 117 http://www.openstreetmap.org/?lat=37.576828&lon=-89.758859
@@ -38,6 +39,7 @@ AR/MO +0 http://www.openstreetmap.org/?lat=35.999710&lon=-89.874641
 154 http://www.openstreetmap.org/?lat=37.974447&lon=-90.189900
 157 http://www.openstreetmap.org/?lat=38.005462&lon=-90.222430
 162 http://www.openstreetmap.org/?lat=38.052856&lon=-90.273156
+165 http://www.openstreetmap.org/?lat=38.092417&lon=-90.300536
 170 http://www.openstreetmap.org/?lat=38.157844&lon=-90.357227
 174 http://www.openstreetmap.org/?lat=38.197273&lon=-90.400057
 175 http://www.openstreetmap.org/?lat=38.213300&lon=-90.405207
@@ -49,7 +51,7 @@ AR/MO +0 http://www.openstreetmap.org/?lat=35.999710&lon=-89.874641
 191 http://www.openstreetmap.org/?lat=38.441926&lon=-90.379672
 193 http://www.openstreetmap.org/?lat=38.461688&lon=-90.373535
 195 http://www.openstreetmap.org/?lat=38.485542&lon=-90.355253
-196 http://www.openstreetmap.org/?lat=38.503311&lon=-90.338087
+196 http://www.openstreetmap.org/?lat=38.503345&lon=-90.338646
 197 http://www.openstreetmap.org/?lat=38.511370&lon=-90.335823
 199 http://www.openstreetmap.org/?lat=38.532758&lon=-90.311136
 200 http://www.openstreetmap.org/?lat=38.540915&lon=-90.302253
diff --git a/hwy_data/MO/usamo/mo.mo021.wpt b/hwy_data/MO/usamo/mo.mo021.wpt
index 1cc4f5a0e5c..d71296beac8 100644
--- a/hwy_data/MO/usamo/mo.mo021.wpt
+++ b/hwy_data/MO/usamo/mo.mo021.wpt
@@ -38,7 +38,7 @@ MO72_W http://www.openstreetmap.org/?lat=37.400062&lon=-90.964737
 CR806 http://www.openstreetmap.org/?lat=37.450026&lon=-90.959502
 MO49_N http://www.openstreetmap.org/?lat=37.481227&lon=-90.895643
 MOsN_Rey http://www.openstreetmap.org/?lat=37.477770&lon=-90.890150
-ParSt http://www.openstreetmap.org/?lat=37.453943&lon=-90.845733
+ParSt http://www.openstreetmap.org/?lat=37.453777&lon=-90.845974
 +X16 http://www.openstreetmap.org/?lat=37.449531&lon=-90.823846
 MO49_S http://www.openstreetmap.org/?lat=37.494082&lon=-90.692182
 MOsAA_Iro http://www.openstreetmap.org/?lat=37.511326&lon=-90.696173
diff --git a/hwy_data/MO/usamo/mo.mo032buspar.wpt b/hwy_data/MO/usamo/mo.mo032buspar.wpt
new file mode 100644
index 00000000000..fc57e072368
--- /dev/null
+++ b/hwy_data/MO/usamo/mo.mo032buspar.wpt
@@ -0,0 +1,7 @@
+MO32_W http://www.openstreetmap.org/?lat=37.825735&lon=-90.540690
+MainSt_N http://www.openstreetmap.org/?lat=37.852297&lon=-90.521604
+US67Bus_N http://www.openstreetmap.org/?lat=37.850993&lon=-90.520273
+SciSt http://www.openstreetmap.org/?lat=37.849468&lon=-90.518857
+CraSt http://www.openstreetmap.org/?lat=37.848866&lon=-90.516390
+US67Bus_S http://www.openstreetmap.org/?lat=37.847333&lon=-90.512956
+MO32_E http://www.openstreetmap.org/?lat=37.842512&lon=-90.514040
\ No newline at end of file
diff --git a/hwy_data/MO/usamo/mo.mo034.wpt b/hwy_data/MO/usamo/mo.mo034.wpt
index f3894b1f598..e332d02407e 100644
--- a/hwy_data/MO/usamo/mo.mo034.wpt
+++ b/hwy_data/MO/usamo/mo.mo034.wpt
@@ -13,6 +13,7 @@ MO49_S http://www.openstreetmap.org/?lat=37.080089&lon=-90.708232
 +X06 http://www.openstreetmap.org/?lat=37.093834&lon=-90.676346
 MOsV_Way http://www.openstreetmap.org/?lat=37.121745&lon=-90.685143
 MOsHH_Way http://www.openstreetmap.org/?lat=37.142684&lon=-90.700893
+MOsB_Ray http://www.openstreetmap.org/?lat=37.154639&lon=-90.695786
 MO49_N http://www.openstreetmap.org/?lat=37.166028&lon=-90.687675
 +X07 http://www.openstreetmap.org/?lat=37.187912&lon=-90.620041
 +X08 http://www.openstreetmap.org/?lat=37.198082&lon=-90.610771
diff --git a/hwy_data/MO/usamo/mo.mo049.wpt b/hwy_data/MO/usamo/mo.mo049.wpt
index eae74987ecd..0fb30520f10 100644
--- a/hwy_data/MO/usamo/mo.mo049.wpt
+++ b/hwy_data/MO/usamo/mo.mo049.wpt
@@ -1,52 +1,64 @@
-US67 http://www.openstreetmap.org/?lat=36.94231&lon=-90.45556
-+X00 http://www.openstreetmap.org/?lat=36.94557&lon=-90.46209
-+X01 http://www.openstreetmap.org/?lat=36.944644&lon=-90.469322
-+X02 http://www.openstreetmap.org/?lat=36.977152&lon=-90.512409
+US67 http://www.openstreetmap.org/?lat=36.942310&lon=-90.455560
++X01 http://www.openstreetmap.org/?lat=36.945570&lon=-90.462090
++X02 http://www.openstreetmap.org/?lat=36.944644&lon=-90.469322
++X03 http://www.openstreetmap.org/?lat=36.977152&lon=-90.512409
 MOsA_E http://www.openstreetmap.org/?lat=36.970775&lon=-90.547514
-+X03 http://www.openstreetmap.org/?lat=36.979072&lon=-90.587339
++X04 http://www.openstreetmap.org/?lat=36.979072&lon=-90.587339
++X05 http://www.openstreetmap.org/?lat=36.967998&lon=-90.617294
 MOsA_W http://www.openstreetmap.org/?lat=36.966867&lon=-90.640297
-+X04 http://www.openstreetmap.org/?lat=37.022120&lon=-90.656261
-+X05 http://www.openstreetmap.org/?lat=37.057540&lon=-90.688105
-+X06 http://www.openstreetmap.org/?lat=37.061941&lon=-90.684071
++X06 http://www.openstreetmap.org/?lat=37.022120&lon=-90.656261
++X07 http://www.openstreetmap.org/?lat=37.057540&lon=-90.688105
++X08 http://www.openstreetmap.org/?lat=37.061941&lon=-90.684071
++X09 http://www.openstreetmap.org/?lat=37.075107&lon=-90.708189
 MO34_W http://www.openstreetmap.org/?lat=37.080089&lon=-90.708232
-+X07 http://www.openstreetmap.org/?lat=37.093834&lon=-90.676346
++X10 http://www.openstreetmap.org/?lat=37.093834&lon=-90.676346
 MOsV_Way http://www.openstreetmap.org/?lat=37.121745&lon=-90.685143
 MOsHH_Way http://www.openstreetmap.org/?lat=37.142684&lon=-90.700893
+MOsB_Ray http://www.openstreetmap.org/?lat=37.154639&lon=-90.695786
 MO34_E http://www.openstreetmap.org/?lat=37.166028&lon=-90.687675
-+X08 http://www.openstreetmap.org/?lat=37.167327&lon=-90.695829
-+X09 http://www.openstreetmap.org/?lat=37.221649&lon=-90.718403
++X11 http://www.openstreetmap.org/?lat=37.167327&lon=-90.695829
++X12 http://www.openstreetmap.org/?lat=37.221649&lon=-90.718403
 MOsCC http://www.openstreetmap.org/?lat=37.236889&lon=-90.702782
++X13 http://www.openstreetmap.org/?lat=37.242492&lon=-90.688963
++X14 http://www.openstreetmap.org/?lat=37.276990&lon=-90.657291
 MO143 http://www.openstreetmap.org/?lat=37.290682&lon=-90.632229
-+X10 http://www.openstreetmap.org/?lat=37.295035&lon=-90.635533
-+X11 http://www.openstreetmap.org/?lat=37.294984&lon=-90.645361
-+X12 http://www.openstreetmap.org/?lat=37.313485&lon=-90.666819
++X15 http://www.openstreetmap.org/?lat=37.295035&lon=-90.635533
++X16 http://www.openstreetmap.org/?lat=37.294984&lon=-90.645361
++X17 http://www.openstreetmap.org/?lat=37.313485&lon=-90.666819
 MOsC_Iro http://www.openstreetmap.org/?lat=37.355524&lon=-90.673857
 MOsK_Iro http://www.openstreetmap.org/?lat=37.360385&lon=-90.697889
-+X13 http://www.openstreetmap.org/?lat=37.438304&lon=-90.701065
-+X14 http://www.openstreetmap.org/?lat=37.457725&lon=-90.686388
++X18 http://www.openstreetmap.org/?lat=37.383935&lon=-90.691967
++X19 http://www.openstreetmap.org/?lat=37.438304&lon=-90.701065
++X20 http://www.openstreetmap.org/?lat=37.457725&lon=-90.686388
 MO21/72_E http://www.openstreetmap.org/?lat=37.494082&lon=-90.692182
-+X15 http://www.openstreetmap.org/?lat=37.449531&lon=-90.823846
-ParSt http://www.openstreetmap.org/?lat=37.453943&lon=-90.845733
++X21 http://www.openstreetmap.org/?lat=37.449531&lon=-90.823846
+ParSt http://www.openstreetmap.org/?lat=37.453777&lon=-90.845974
 MOsN_Rey http://www.openstreetmap.org/?lat=37.477770&lon=-90.890150
-MO21/72_W http://www.openstreetmap.org/?lat=37.482827&lon=-90.897703
+MO21/72_W http://www.openstreetmap.org/?lat=37.481227&lon=-90.895643
++X22 http://www.openstreetmap.org/?lat=37.501623&lon=-90.922937
++X23 http://www.openstreetmap.org/?lat=37.517351&lon=-90.916157
 MOsJ_Rey http://www.openstreetmap.org/?lat=37.527800&lon=-90.934267
-+X17 http://www.openstreetmap.org/?lat=37.543522&lon=-90.922251
-+X18 http://www.openstreetmap.org/?lat=37.574141&lon=-90.925426
-+X19 http://www.openstreetmap.org/?lat=37.579719&lon=-90.932980
++X24 http://www.openstreetmap.org/?lat=37.543522&lon=-90.922251
++X25 http://www.openstreetmap.org/?lat=37.574141&lon=-90.925426
++X26 http://www.openstreetmap.org/?lat=37.579719&lon=-90.932980
 MOsA_Rey http://www.openstreetmap.org/?lat=37.588408&lon=-90.933151
-+X20 http://www.openstreetmap.org/?lat=37.615965&lon=-90.963449
-+X21 http://www.openstreetmap.org/?lat=37.618821&lon=-91.007137
++X27 http://www.openstreetmap.org/?lat=37.615965&lon=-90.963449
++X28 http://www.openstreetmap.org/?lat=37.618821&lon=-91.007137
++X29 http://www.openstreetmap.org/?lat=37.629324&lon=-91.022243
 MO32_E http://www.openstreetmap.org/?lat=37.671881&lon=-91.039925
-+X22 http://www.openstreetmap.org/?lat=37.674157&lon=-91.067820
-+X23 http://www.openstreetmap.org/?lat=37.660773&lon=-91.076918
-+X24 http://www.openstreetmap.org/?lat=37.663287&lon=-91.084557
-+X25 http://www.openstreetmap.org/?lat=37.655541&lon=-91.094685
++X30 http://www.openstreetmap.org/?lat=37.674157&lon=-91.067820
++X31 http://www.openstreetmap.org/?lat=37.660773&lon=-91.076918
++X32 http://www.openstreetmap.org/?lat=37.663287&lon=-91.084557
++X33 http://www.openstreetmap.org/?lat=37.655541&lon=-91.094685
 MO32_W http://www.openstreetmap.org/?lat=37.660144&lon=-91.115456
 MOsY_Iro http://www.openstreetmap.org/?lat=37.717945&lon=-91.136398
-+X26 http://www.openstreetmap.org/?lat=37.722155&lon=-91.184120
-+X27 http://www.openstreetmap.org/?lat=37.744759&lon=-91.211586
-+X28 http://www.openstreetmap.org/?lat=37.751885&lon=-91.208582
-+X29 http://www.openstreetmap.org/?lat=37.779365&lon=-91.230211
-MOsV_Cra http://www.openstreetmap.org/?lat=37.803240&lon=-91.215019
-+X30 http://www.openstreetmap.org/?lat=37.844732&lon=-91.250811
-MO19 http://www.openstreetmap.org/?lat=37.851577&lon=-91.277246
++X34 http://www.openstreetmap.org/?lat=37.723614&lon=-91.156654
++X35 http://www.openstreetmap.org/?lat=37.722155&lon=-91.184120
++X36 http://www.openstreetmap.org/?lat=37.731082&lon=-91.188240
++X37 http://www.openstreetmap.org/?lat=37.744759&lon=-91.211586
++X38 http://www.openstreetmap.org/?lat=37.751885&lon=-91.208582
++X39 http://www.openstreetmap.org/?lat=37.779365&lon=-91.230211
+MOsV_Cra http://www.openstreetmap.org/?lat=37.803036&lon=-91.214890
++X40 http://www.openstreetmap.org/?lat=37.820497&lon=-91.238194
++X41 http://www.openstreetmap.org/?lat=37.844732&lon=-91.250811
+MO19 http://www.openstreetmap.org/?lat=37.851577&lon=-91.277246
\ No newline at end of file
diff --git a/hwy_data/MO/usamo/mo.mo072.wpt b/hwy_data/MO/usamo/mo.mo072.wpt
index 1ea777de77a..527270ba1c1 100644
--- a/hwy_data/MO/usamo/mo.mo072.wpt
+++ b/hwy_data/MO/usamo/mo.mo072.wpt
@@ -41,9 +41,9 @@ MOsB_Rey http://www.openstreetmap.org/?lat=37.403131&lon=-91.073399
 +X13 http://www.openstreetmap.org/?lat=37.414516&lon=-91.012115
 MO21_S http://www.openstreetmap.org/?lat=37.400062&lon=-90.964737
 CR806 http://www.openstreetmap.org/?lat=37.450026&lon=-90.959502
-MO49_N http://www.openstreetmap.org/?lat=37.482827&lon=-90.897703
+MO49_N http://www.openstreetmap.org/?lat=37.481227&lon=-90.895643
 MOsN_Rey http://www.openstreetmap.org/?lat=37.477770&lon=-90.890150
-ParSt http://www.openstreetmap.org/?lat=37.453943&lon=-90.845733
+ParSt http://www.openstreetmap.org/?lat=37.453777&lon=-90.845974
 +X16 http://www.openstreetmap.org/?lat=37.449531&lon=-90.823846
 MO49_S http://www.openstreetmap.org/?lat=37.494082&lon=-90.692182
 MOsAA_Iro http://www.openstreetmap.org/?lat=37.511326&lon=-90.696173
@@ -87,4 +87,4 @@ MOsB_Bol http://www.openstreetmap.org/?lat=37.484547&lon=-89.904385
 MOsB_Cap http://www.openstreetmap.org/?lat=37.426650&lon=-89.782419
 MO34_W http://www.openstreetmap.org/?lat=37.390601&lon=-89.726458
 MOsPP_Cap http://www.openstreetmap.org/?lat=37.380013&lon=-89.678049
-I-55BL/61 http://www.openstreetmap.org/?lat=37.376961&lon=-89.667277
+I-55BL/61 http://www.openstreetmap.org/?lat=37.376961&lon=-89.667277
\ No newline at end of file
diff --git a/hwy_data/MO/usamo/mo.mo094.wpt b/hwy_data/MO/usamo/mo.mo094.wpt
index aac5936a364..52269ab8c14 100644
--- a/hwy_data/MO/usamo/mo.mo094.wpt
+++ b/hwy_data/MO/usamo/mo.mo094.wpt
@@ -34,8 +34,8 @@ MOsDD_StC http://www.openstreetmap.org/?lat=38.652824&lon=-90.776424
 MOsD_StC http://www.openstreetmap.org/?lat=38.703363&lon=-90.709820
 I-64 http://www.openstreetmap.org/?lat=38.711735&lon=-90.690336
 WolRd http://www.openstreetmap.org/?lat=38.727706&lon=-90.644245
-8A(364) +MidRivDr +MO364_W http://www.openstreetmap.org/?lat=38.737883&lon=-90.633302
-8B(364) http://www.openstreetmap.org/?lat=38.740444&lon=-90.617809
+8 +8A(364) +MidRivDr http://www.openstreetmap.org/?lat=38.737883&lon=-90.633302
+9A(364) +8B(364) http://www.openstreetmap.org/?lat=38.740444&lon=-90.617809
 9(364) +MOsN_StC http://www.openstreetmap.org/?lat=38.742001&lon=-90.608325
 10(364) http://www.openstreetmap.org/?lat=38.746034&lon=-90.600364
 11(364) http://www.openstreetmap.org/?lat=38.748201&lon=-90.583928
diff --git a/hwy_data/MO/usamo/mo.mo114.wpt b/hwy_data/MO/usamo/mo.mo114.wpt
index ce714e63e34..1925ffe0d83 100644
--- a/hwy_data/MO/usamo/mo.mo114.wpt
+++ b/hwy_data/MO/usamo/mo.mo114.wpt
@@ -5,5 +5,5 @@ MO153 http://www.openstreetmap.org/?lat=36.819008&lon=-89.807739
 US60 http://www.openstreetmap.org/?lat=36.838528&lon=-89.714634
 MOsE http://www.openstreetmap.org/?lat=36.847586&lon=-89.686375
 US60Bus_W http://www.openstreetmap.org/?lat=36.863202&lon=-89.632870
-HarSt http://www.openstreetmap.org/?lat=36.876746&lon=-89.587562
+KinHwy http://www.openstreetmap.org/?lat=36.876746&lon=-89.587562
 US61/62 http://www.openstreetmap.org/?lat=36.878891&lon=-89.579923
diff --git a/hwy_data/MO/usamo/mo.mo364.wpt b/hwy_data/MO/usamo/mo.mo364.wpt
index 9f1ae965263..8153beca321 100644
--- a/hwy_data/MO/usamo/mo.mo364.wpt
+++ b/hwy_data/MO/usamo/mo.mo364.wpt
@@ -1,18 +1,18 @@
 1A +I-64 http://www.openstreetmap.org/?lat=38.770380&lon=-90.776982
-1C http://www.openstreetmap.org/?lat=38.771056&lon=-90.766404
+1C http://www.openstreetmap.org/?lat=38.771233&lon=-90.770159
 2 http://www.openstreetmap.org/?lat=38.768383&lon=-90.742044
 4 http://www.openstreetmap.org/?lat=38.753240&lon=-90.700118
 6 http://www.openstreetmap.org/?lat=38.734818&lon=-90.665913
-8A +MidRivDr http://www.openstreetmap.org/?lat=38.737883&lon=-90.633302
-8B http://www.openstreetmap.org/?lat=38.740444&lon=-90.617809
+8 +8A +MidRivDr http://www.openstreetmap.org/?lat=38.737883&lon=-90.633302
+9A +8B http://www.openstreetmap.org/?lat=38.740444&lon=-90.617809
 9 http://www.openstreetmap.org/?lat=38.742001&lon=-90.608325
 10 http://www.openstreetmap.org/?lat=38.746034&lon=-90.600364
 11 http://www.openstreetmap.org/?lat=38.748201&lon=-90.583928
 11B http://www.openstreetmap.org/?lat=38.750000&lon=-90.569851
 13A http://www.openstreetmap.org/?lat=38.752933&lon=-90.553774
-13B +13 +MO94_E +MO94 http://www.openstreetmap.org/?lat=38.755188&lon=-90.543652
+13B +MO94_E +MO94 http://www.openstreetmap.org/?lat=38.755188&lon=-90.543652
 14 http://www.openstreetmap.org/?lat=38.743975&lon=-90.529661
 17 http://www.openstreetmap.org/?lat=38.707649&lon=-90.502110
 +X02 http://www.openstreetmap.org/?lat=38.706042&lon=-90.477562
-19 +BenPl http://www.openstreetmap.org/?lat=38.695860&lon=-90.464773
+19 http://www.openstreetmap.org/?lat=38.695860&lon=-90.464773
 20 +I-270 http://www.openstreetmap.org/?lat=38.698138&lon=-90.450268
\ No newline at end of file
diff --git a/hwy_data/MO/usamo/mo.mo370.wpt b/hwy_data/MO/usamo/mo.mo370.wpt
index bc45cff77d1..1dc64120287 100644
--- a/hwy_data/MO/usamo/mo.mo370.wpt
+++ b/hwy_data/MO/usamo/mo.mo370.wpt
@@ -1,8 +1,8 @@
-I-70 http://www.openstreetmap.org/?lat=38.798380&lon=-90.591416
-SpeRd http://www.openstreetmap.org/?lat=38.811623&lon=-90.585666
-TruRd http://www.openstreetmap.org/?lat=38.817576&lon=-90.561204
-ElmSt http://www.openstreetmap.org/?lat=38.824330&lon=-90.518074
-MO94 http://www.openstreetmap.org/?lat=38.803196&lon=-90.475416
-MO141 +MisBotRd http://www.openstreetmap.org/?lat=38.792159&lon=-90.452328
-StLMillBlvd http://www.openstreetmap.org/?lat=38.783863&lon=-90.418296
-I-270 http://www.openstreetmap.org/?lat=38.769811&lon=-90.406623
+1A +I-70 http://www.openstreetmap.org/?lat=38.798380&lon=-90.591416
+1B http://www.openstreetmap.org/?lat=38.811623&lon=-90.585666
+2 http://www.openstreetmap.org/?lat=38.817576&lon=-90.561204
+5 http://www.openstreetmap.org/?lat=38.824330&lon=-90.518074
+7 http://www.openstreetmap.org/?lat=38.803196&lon=-90.475416
+9 +MO141 +MisBotRd http://www.openstreetmap.org/?lat=38.792159&lon=-90.452328
+11 +StLMillBlvd http://www.openstreetmap.org/?lat=38.783863&lon=-90.418296
+12 +I-270 http://www.openstreetmap.org/?lat=38.769811&lon=-90.406623
\ No newline at end of file
diff --git a/hwy_data/MO/usaus/mo.us060.wpt b/hwy_data/MO/usaus/mo.us060.wpt
index 2b4c1b496af..c78cad50a53 100644
--- a/hwy_data/MO/usaus/mo.us060.wpt
+++ b/hwy_data/MO/usaus/mo.us060.wpt
@@ -132,7 +132,7 @@ US60BusDex_E http://www.openstreetmap.org/?lat=36.816277&lon=-89.941764
 MO153 +MO153/N http://www.openstreetmap.org/?lat=36.829966&lon=-89.807557
 MO114 http://www.openstreetmap.org/?lat=36.838528&lon=-89.714634
 MOsE_NMa http://www.openstreetmap.org/?lat=36.840451&lon=-89.686203
-US60BusSik_E http://www.openstreetmap.org/?lat=36.844255&lon=-89.631969
+US60BusSik_W +US60BusSik_E http://www.openstreetmap.org/?lat=36.844255&lon=-89.631969
 US61/62 http://www.openstreetmap.org/?lat=36.855948&lon=-89.582691
 I-57(1) http://www.openstreetmap.org/?lat=36.873543&lon=-89.532951
 I-57(4) http://www.openstreetmap.org/?lat=36.900798&lon=-89.455833
diff --git a/hwy_data/MO/usaus/mo.us062.wpt b/hwy_data/MO/usaus/mo.us062.wpt
index 98b89900abf..d9581f17295 100644
--- a/hwy_data/MO/usaus/mo.us062.wpt
+++ b/hwy_data/MO/usaus/mo.us062.wpt
@@ -20,7 +20,7 @@ MOsP_New http://www.openstreetmap.org/?lat=36.671500&lon=-89.553101
 MOsW_New http://www.openstreetmap.org/?lat=36.672894&lon=-89.553337
 MO80 http://www.openstreetmap.org/?lat=36.759043&lon=-89.565997
 US60 http://www.openstreetmap.org/?lat=36.855948&lon=-89.582691
-KinHwy_S http://www.openstreetmap.org/?lat=36.863476&lon=-89.582841
+KinHwy http://www.openstreetmap.org/?lat=36.863476&lon=-89.582841
 US61/60Bus http://www.openstreetmap.org/?lat=36.878891&lon=-89.579923
 MOsAA/H http://www.openstreetmap.org/?lat=36.891197&lon=-89.538038
 I-55(67) http://www.openstreetmap.org/?lat=36.892535&lon=-89.533349
diff --git a/hwy_data/MO/usaus/mo.us067.wpt b/hwy_data/MO/usaus/mo.us067.wpt
index 5565179fef4..8e1dd4ccf07 100644
--- a/hwy_data/MO/usaus/mo.us067.wpt
+++ b/hwy_data/MO/usaus/mo.us067.wpt
@@ -1,7 +1,6 @@
 AR/MO http://www.openstreetmap.org/?lat=36.498451&lon=-90.539875
 +X00a http://www.openstreetmap.org/?lat=36.524300&lon=-90.539480
 CR270 http://www.openstreetmap.org/?lat=36.546990&lon=-90.522100
-+X00b http://www.openstreetmap.org/?lat=36.550440&lon=-90.521210
 MO142 http://www.openstreetmap.org/?lat=36.561842&lon=-90.520992
 *WesBlvd_S http://www.openstreetmap.org/?lat=36.656604&lon=-90.520048
 US160/158 +US160 http://www.openstreetmap.org/?lat=36.663892&lon=-90.515413
@@ -9,12 +8,13 @@ US160/158 +US160 http://www.openstreetmap.org/?lat=36.663892&lon=-90.515413
 CR323 http://www.openstreetmap.org/?lat=36.687392&lon=-90.484428
 US67BusPop_S http://www.openstreetmap.org/?lat=36.728893&lon=-90.462456
 MOsPP http://www.openstreetmap.org/?lat=36.766856&lon=-90.455933
+OakGroRd http://www.openstreetmap.org/?lat=36.788838&lon=-90.449753
 US60/67Bus +US67BusPop/60 http://www.openstreetmap.org/?lat=36.794792&lon=-90.443251
 +X02 http://www.openstreetmap.org/?lat=36.817359&lon=-90.484943
 US60_W http://www.openstreetmap.org/?lat=36.841576&lon=-90.498451
 +X03 http://www.openstreetmap.org/?lat=36.860800&lon=-90.508480
 +X04 http://www.openstreetmap.org/?lat=36.886100&lon=-90.499400
-MOsO_But http://www.openstreetmap.org/?lat=36.919990&lon=-90.462750
+MOsO_But +X05 http://www.openstreetmap.org/?lat=36.919990&lon=-90.462750
 +X05a http://www.openstreetmap.org/?lat=36.929890&lon=-90.456830
 MO49/172 http://www.openstreetmap.org/?lat=36.942310&lon=-90.455560
 +X06 http://www.openstreetmap.org/?lat=36.981815&lon=-90.445890
@@ -41,7 +41,7 @@ MOsJJ http://www.openstreetmap.org/?lat=37.409147&lon=-90.313926
 +X13 http://www.openstreetmap.org/?lat=37.433397&lon=-90.297575
 MurMillRd http://www.openstreetmap.org/?lat=37.473377&lon=-90.301394
 US67BusChe_S http://www.openstreetmap.org/?lat=37.486353&lon=-90.306523
-US67BusChe_N http://www.openstreetmap.org/?lat=37.491681&lon=-90.307574
+US67BusChe_N +US67BusFre_S http://www.openstreetmap.org/?lat=37.491681&lon=-90.307574
 US67BusFre/E http://www.openstreetmap.org/?lat=37.521742&lon=-90.313550
 +X13a http://www.openstreetmap.org/?lat=37.547436&lon=-90.324268
 US67BusFre/72 http://www.openstreetmap.org/?lat=37.564370&lon=-90.321565
@@ -52,10 +52,10 @@ MO221 http://www.openstreetmap.org/?lat=37.771775&lon=-90.445236
 MapSt http://www.openstreetmap.org/?lat=37.787505&lon=-90.443959
 MO32_E http://www.openstreetmap.org/?lat=37.797145&lon=-90.443101
 FairDr http://www.openstreetmap.org/?lat=37.822967&lon=-90.461361
-US67BusDes/32 http://www.openstreetmap.org/?lat=37.838962&lon=-90.484471
+US67BusDes/32 +US67BusPar/32 http://www.openstreetmap.org/?lat=37.838962&lon=-90.484471
 ParDr http://www.openstreetmap.org/?lat=37.864385&lon=-90.493441
 US67BusDes/8 http://www.openstreetmap.org/?lat=37.880942&lon=-90.509566
-MO47 http://www.openstreetmap.org/?lat=37.922179&lon=-90.538416
+MO47 +MO47/K http://www.openstreetmap.org/?lat=37.922179&lon=-90.538416
 +X14 http://www.openstreetmap.org/?lat=37.954993&lon=-90.551634
 +X15 http://www.openstreetmap.org/?lat=37.991259&lon=-90.526915
 MOsY_StF http://www.openstreetmap.org/?lat=38.010932&lon=-90.487615
@@ -69,7 +69,7 @@ SunRd http://www.openstreetmap.org/?lat=38.147855&lon=-90.465342
 MOsCC_Jef http://www.openstreetmap.org/?lat=38.191632&lon=-90.415238
 I-55(174) http://www.openstreetmap.org/?lat=38.197273&lon=-90.400057
 US61_S http://www.openstreetmap.org/?lat=38.201303&lon=-90.395851
-MOsA_Jef http://www.openstreetmap.org/?lat=38.211108&lon=-90.392504
+MOsA_Jef +MOsA_Cry http://www.openstreetmap.org/?lat=38.211108&lon=-90.392504
 MainSt_Cry http://www.openstreetmap.org/?lat=38.218980&lon=-90.385140
 MisAve http://www.openstreetmap.org/?lat=38.229770&lon=-90.386840
 +X17 http://www.openstreetmap.org/?lat=38.244399&lon=-90.396194
@@ -83,7 +83,7 @@ MOsZ_Jef http://www.openstreetmap.org/?lat=38.291174&lon=-90.396109
 +X20 http://www.openstreetmap.org/?lat=38.341219&lon=-90.393448
 MOsM_Jef http://www.openstreetmap.org/?lat=38.343516&lon=-90.385981
 SulSprRd http://www.openstreetmap.org/?lat=38.343600&lon=-90.382515
-MainSt_Imp http://www.openstreetmap.org/?lat=38.368899&lon=-90.376142
+MainSt_Imp +ImpMainSt http://www.openstreetmap.org/?lat=38.368899&lon=-90.376142
 MO231 http://www.openstreetmap.org/?lat=38.405009&lon=-90.377011
 RicRd http://www.openstreetmap.org/?lat=38.409894&lon=-90.381496
 SJCRd http://www.openstreetmap.org/?lat=38.414467&lon=-90.378417
@@ -94,7 +94,7 @@ ButHillRd http://www.openstreetmap.org/?lat=38.485450&lon=-90.348794
 MatRd http://www.openstreetmap.org/?lat=38.494360&lon=-90.344814
 ForRd http://www.openstreetmap.org/?lat=38.501296&lon=-90.332294
 I-255 http://www.openstreetmap.org/?lat=38.502605&lon=-90.330362
-US50_E http://www.openstreetmap.org/?lat=38.505939&lon=-90.325974
+US50_E +US50 http://www.openstreetmap.org/?lat=38.505939&lon=-90.325974
 I-55(197) http://www.openstreetmap.org/?lat=38.511370&lon=-90.335823
 MO21 http://www.openstreetmap.org/?lat=38.523761&lon=-90.354481
 BapChuRd http://www.openstreetmap.org/?lat=38.525230&lon=-90.361487
@@ -126,10 +126,10 @@ WasSt http://www.openstreetmap.org/?lat=38.796800&lon=-90.338849
 PatRd http://www.openstreetmap.org/?lat=38.800069&lon=-90.333849
 StFerSt http://www.openstreetmap.org/?lat=38.799224&lon=-90.328249
 NewFloRd http://www.openstreetmap.org/?lat=38.800128&lon=-90.315943
-MOsAC_StL http://www.openstreetmap.org/?lat=38.809224&lon=-90.298980
-OldHFRd http://www.openstreetmap.org/?lat=38.815954&lon=-90.280881
+MOsAC_StL +MOsAC http://www.openstreetmap.org/?lat=38.809224&lon=-90.298980
+OldHFRd +OHalFerRd http://www.openstreetmap.org/?lat=38.815954&lon=-90.280881
 OldJamRd http://www.openstreetmap.org/?lat=38.823042&lon=-90.249778
 MO367 http://www.openstreetmap.org/?lat=38.818244&lon=-90.231475
 BelBr http://www.openstreetmap.org/?lat=38.838605&lon=-90.237923
 MO94 http://www.openstreetmap.org/?lat=38.861674&lon=-90.223557
-MO/IL http://www.openstreetmap.org/?lat=38.880844&lon=-90.181489
+MO/IL http://www.openstreetmap.org/?lat=38.880844&lon=-90.181489
\ No newline at end of file
diff --git a/hwy_data/MO/usausb/mo.us060busdex.wpt b/hwy_data/MO/usausb/mo.us060busdex.wpt
index fb600452c94..cd199450e88 100644
--- a/hwy_data/MO/usausb/mo.us060busdex.wpt
+++ b/hwy_data/MO/usausb/mo.us060busdex.wpt
@@ -1,5 +1,5 @@
 US60_W http://www.openstreetmap.org/?lat=36.803761&lon=-89.996610
-N1MileRd http://www.openstreetmap.org/?lat=36.803632&lon=-89.970217
-NWalSt http://www.openstreetmap.org/?lat=36.799552&lon=-89.957621
+OneMileRd +N1MileRd http://www.openstreetmap.org/?lat=36.803632&lon=-89.970217
+WalSt http://www.openstreetmap.org/?lat=36.799552&lon=-89.957621
 MO25_S http://www.openstreetmap.org/?lat=36.798581&lon=-89.950401
-US60_E http://www.openstreetmap.org/?lat=36.816277&lon=-89.941764
+US60_E http://www.openstreetmap.org/?lat=36.816277&lon=-89.941764
\ No newline at end of file
diff --git a/hwy_data/MO/usausb/mo.us060buspop.wpt b/hwy_data/MO/usausb/mo.us060buspop.wpt
index 3d1d3dabd79..b8e99f3e083 100644
--- a/hwy_data/MO/usausb/mo.us060buspop.wpt
+++ b/hwy_data/MO/usausb/mo.us060buspop.wpt
@@ -7,4 +7,4 @@ MOsWW http://www.openstreetmap.org/?lat=36.757350&lon=-90.395390
 MainSt +NMainSt http://www.openstreetmap.org/?lat=36.756989&lon=-90.393276
 PeaSt http://www.openstreetmap.org/?lat=36.756980&lon=-90.385594
 MOsB http://www.openstreetmap.org/?lat=36.767939&lon=-90.370939
-US60_E http://www.openstreetmap.org/?lat=36.793753&lon=-90.343602
+US60_E http://www.openstreetmap.org/?lat=36.793753&lon=-90.343602
\ No newline at end of file
diff --git a/hwy_data/MO/usausb/mo.us060bussik.wpt b/hwy_data/MO/usausb/mo.us060bussik.wpt
index 4ac59f40e2f..beb5197403d 100644
--- a/hwy_data/MO/usausb/mo.us060bussik.wpt
+++ b/hwy_data/MO/usausb/mo.us060bussik.wpt
@@ -1,6 +1,6 @@
 US60_W http://www.openstreetmap.org/?lat=36.844255&lon=-89.631969
 MO114_W http://www.openstreetmap.org/?lat=36.863202&lon=-89.632870
-HarSt http://www.openstreetmap.org/?lat=36.876746&lon=-89.587562
+KinHwy_N http://www.openstreetmap.org/?lat=36.876746&lon=-89.587562
 US61/62 http://www.openstreetmap.org/?lat=36.878891&lon=-89.579923
-KinHwy http://www.openstreetmap.org/?lat=36.863476&lon=-89.582841
-US60_E http://www.openstreetmap.org/?lat=36.855948&lon=-89.582691
+KinHwy_S http://www.openstreetmap.org/?lat=36.863476&lon=-89.582841
+US60_E http://www.openstreetmap.org/?lat=36.855948&lon=-89.582691
\ No newline at end of file
diff --git a/hwy_data/MO/usausb/mo.us067buspop.wpt b/hwy_data/MO/usausb/mo.us067buspop.wpt
index b6616da8a75..d1017e14ca6 100644
--- a/hwy_data/MO/usausb/mo.us067buspop.wpt
+++ b/hwy_data/MO/usausb/mo.us067buspop.wpt
@@ -1,7 +1,9 @@
 US67_S http://www.openstreetmap.org/?lat=36.728893&lon=-90.462456
++X01 http://www.openstreetmap.org/?lat=36.734035&lon=-90.431063
 MO53 http://www.openstreetmap.org/?lat=36.744507&lon=-90.413382
-US60Bus_E US160/60Bus +US60/160 http://www.openstreetmap.org/?lat=36.758751&lon=-90.407664
+US60Bus_E +US160/60Bus +US60/160 http://www.openstreetmap.org/?lat=36.758751&lon=-90.407664
 HarSt +WHarSt http://www.openstreetmap.org/?lat=36.766315&lon=-90.413961
 MOsPP http://www.openstreetmap.org/?lat=36.767561&lon=-90.414938
-MOsP http://www.openstreetmap.org/?lat=36.792275&lon=-90.436503
+OakGrRd http://www.openstreetmap.org/?lat=36.788855&lon=-90.432007
+MOsW http://www.openstreetmap.org/?lat=36.793186&lon=-90.439088
 US67_N http://www.openstreetmap.org/?lat=36.794792&lon=-90.443251
\ No newline at end of file
diff --git a/hwy_data/SD/usasd/sd.sd020.wpt b/hwy_data/SD/usasd/sd.sd020.wpt
index 9899bfb21be..9de423aedfc 100644
--- a/hwy_data/SD/usasd/sd.sd020.wpt
+++ b/hwy_data/SD/usasd/sd.sd020.wpt
@@ -99,5 +99,6 @@ CR6/19 http://www.openstreetmap.org/?lat=44.991907&lon=-97.269859
 449thAve http://www.openstreetmap.org/?lat=44.973724&lon=-97.229090
 OldSD139 +SD139 http://www.openstreetmap.org/?lat=44.952909&lon=-97.205744
 +X15 http://www.openstreetmap.org/?lat=44.944875&lon=-97.176304
+LakeDr_S http://www.openstreetmap.org/?lat=44.939013&lon=-97.167914
 10thAveNW http://www.openstreetmap.org/?lat=44.912092&lon=-97.131758
 US212 http://www.openstreetmap.org/?lat=44.890175&lon=-97.131844
diff --git a/hwy_data/WI/usaus/wi.us012.wpt b/hwy_data/WI/usaus/wi.us012.wpt
index eda3f01eb6f..3e59be5f8da 100644
--- a/hwy_data/WI/usaus/wi.us012.wpt
+++ b/hwy_data/WI/usaus/wi.us012.wpt
@@ -177,7 +177,8 @@ CRK_Dan http://www.openstreetmap.org/?lat=43.140452&lon=-89.519777
 265 http://www.openstreetmap.org/?lat=43.044743&lon=-89.324040
 266 +US51 http://www.openstreetmap.org/?lat=43.045982&lon=-89.306896
 267 +I-39/90 http://www.openstreetmap.org/?lat=43.046370&lon=-89.277698
-269 +CRAB_Dan http://www.openstreetmap.org/?lat=43.040508&lon=-89.246836
+268 http://www.openstreetmap.org/?lat=43.044621&lon=-89.263734
+269 +CRAB_Dan http://www.openstreetmap.org/?lat=43.039677&lon=-89.243102
 272 http://www.openstreetmap.org/?lat=43.031506&lon=-89.199886
 NoraRd http://www.openstreetmap.org/?lat=43.030628&lon=-89.149933
 CRW_Dan http://www.openstreetmap.org/?lat=43.036337&lon=-89.107103
diff --git a/hwy_data/WI/usaus/wi.us018.wpt b/hwy_data/WI/usaus/wi.us018.wpt
index 4cf654ed580..c3601d703ed 100644
--- a/hwy_data/WI/usaus/wi.us018.wpt
+++ b/hwy_data/WI/usaus/wi.us018.wpt
@@ -68,7 +68,8 @@ AttWay http://www.openstreetmap.org/?lat=43.034382&lon=-89.456054
 265(12) +CRBB_Dan http://www.openstreetmap.org/?lat=43.044743&lon=-89.324040
 266(12) +US51 http://www.openstreetmap.org/?lat=43.045982&lon=-89.306896
 267(12) +I-39/90 http://www.openstreetmap.org/?lat=43.046370&lon=-89.277698
-269(12) +CRAB_Dan http://www.openstreetmap.org/?lat=43.040508&lon=-89.246836
+268(12) http://www.openstreetmap.org/?lat=43.044621&lon=-89.263734
+269(12) +CRAB_Dan http://www.openstreetmap.org/?lat=43.039677&lon=-89.243102
 272(12) +CRN_Dan http://www.openstreetmap.org/?lat=43.031506&lon=-89.199886
 NoraRd http://www.openstreetmap.org/?lat=43.030628&lon=-89.149933
 CRW_Dan http://www.openstreetmap.org/?lat=43.036337&lon=-89.107103
diff --git a/hwy_data/WI/usaus/wi.us151.wpt b/hwy_data/WI/usaus/wi.us151.wpt
index 5285fc66e48..416927539dd 100644
--- a/hwy_data/WI/usaus/wi.us151.wpt
+++ b/hwy_data/WI/usaus/wi.us151.wpt
@@ -1,10 +1,10 @@
 IA/WI http://www.openstreetmap.org/?lat=42.515639&lon=-90.636413
 +X01 http://www.openstreetmap.org/?lat=42.515962&lon=-90.618265
 1 +WI11 http://www.openstreetmap.org/?lat=42.520700&lon=-90.614719
-2 +BadRd http://www.openstreetmap.org/?lat=42.535279&lon=-90.611243
-3 +EagPtRd http://www.openstreetmap.org/?lat=42.554076&lon=-90.609720
-5A +CRHHH_Gra http://www.openstreetmap.org/?lat=42.579030&lon=-90.608153
-5B +CRH_Gra http://www.openstreetmap.org/?lat=42.588541&lon=-90.602746
+2 http://www.openstreetmap.org/?lat=42.535279&lon=-90.611243
+3 http://www.openstreetmap.org/?lat=42.554076&lon=-90.609720
+5A http://www.openstreetmap.org/?lat=42.579030&lon=-90.608153
+5B http://www.openstreetmap.org/?lat=42.588541&lon=-90.602746
 8 +US61_N http://www.openstreetmap.org/?lat=42.616844&lon=-90.586138
 HillCliRd http://www.openstreetmap.org/?lat=42.646001&lon=-90.575742
 +X02 http://www.openstreetmap.org/?lat=42.657665&lon=-90.570946
@@ -12,17 +12,17 @@ HillCliRd http://www.openstreetmap.org/?lat=42.646001&lon=-90.575742
 +X04 http://www.openstreetmap.org/?lat=42.669783&lon=-90.550303
 CRO_Gra http://www.openstreetmap.org/?lat=42.701929&lon=-90.527430
 +X05 http://www.openstreetmap.org/?lat=42.710854&lon=-90.512066
-18 +US151BusPla_S http://www.openstreetmap.org/?lat=42.712620&lon=-90.485201
+18 http://www.openstreetmap.org/?lat=42.712620&lon=-90.485201
 19 +WI80/81 http://www.openstreetmap.org/?lat=42.713912&lon=-90.457134
-21 +US151BusPla_N http://www.openstreetmap.org/?lat=42.732892&lon=-90.433617
+21 http://www.openstreetmap.org/?lat=42.732892&lon=-90.433617
 26 +WI126 http://www.openstreetmap.org/?lat=42.744743&lon=-90.338430
 *CotInnRd http://www.openstreetmap.org/?lat=42.754575&lon=-90.322638
 +X06 http://www.openstreetmap.org/?lat=42.782239&lon=-90.303993
 CRA_Iow http://www.openstreetmap.org/?lat=42.823862&lon=-90.245822
-37 +US151BusMin http://www.openstreetmap.org/?lat=42.848345&lon=-90.198441
+37 http://www.openstreetmap.org/?lat=42.848345&lon=-90.198441
 +X07 http://www.openstreetmap.org/?lat=42.861590&lon=-90.202646
 +X08 http://www.openstreetmap.org/?lat=42.877084&lon=-90.189843
-40 +WI23_S +US151BusMin/23 http://www.openstreetmap.org/?lat=42.886216&lon=-90.165482
+40 http://www.openstreetmap.org/?lat=42.886216&lon=-90.165482
 CRD_Iow http://www.openstreetmap.org/?lat=42.905881&lon=-90.141122
 CRY_Iow http://www.openstreetmap.org/?lat=42.916521&lon=-90.138574
 JacRd http://www.openstreetmap.org/?lat=42.923938&lon=-90.137029
@@ -34,30 +34,30 @@ CRYZ_Iow http://www.openstreetmap.org/?lat=42.969530&lon=-90.045043
 +X09 http://www.openstreetmap.org/?lat=42.996574&lon=-89.985434
 CRHHH_IowS http://www.openstreetmap.org/?lat=43.004396&lon=-89.975774
 +X10 http://www.openstreetmap.org/?lat=43.009248&lon=-89.952501
-58 +CRID_W http://www.openstreetmap.org/?lat=43.009668&lon=-89.902067
+58 http://www.openstreetmap.org/?lat=43.009668&lon=-89.902067
 CRK_Iow http://www.openstreetmap.org/?lat=43.010421&lon=-89.880180
 CRF_Dan http://www.openstreetmap.org/?lat=43.010367&lon=-89.824434
 +X11 http://www.openstreetmap.org/?lat=43.010139&lon=-89.794701
 65 +WI78_S http://www.openstreetmap.org/?lat=43.001038&lon=-89.760211
 +X12 http://www.openstreetmap.org/?lat=42.992814&lon=-89.734869
 69 +CRID_E http://www.openstreetmap.org/?lat=43.004490&lon=-89.702640
-70 +CRPD_DanW http://www.openstreetmap.org/?lat=42.999092&lon=-89.668779
+70 http://www.openstreetmap.org/?lat=42.999092&lon=-89.668779
 +X13 http://www.openstreetmap.org/?lat=42.989147&lon=-89.653040
 CRJ_Dan http://www.openstreetmap.org/?lat=42.988121&lon=-89.630971
-75 +CRG_Dan http://www.openstreetmap.org/?lat=42.987384&lon=-89.582605
-76 +US151BusVer_S http://www.openstreetmap.org/?lat=42.985500&lon=-89.559989
-77 +WI69 http://www.openstreetmap.org/?lat=42.974637&lon=-89.545784
-79 +CRPB_Dan http://www.openstreetmap.org/?lat=42.975657&lon=-89.513254
+75 http://www.openstreetmap.org/?lat=42.987384&lon=-89.582605
+76 http://www.openstreetmap.org/?lat=42.985500&lon=-89.559989
+77 http://www.openstreetmap.org/?lat=42.974637&lon=-89.545784
+79 http://www.openstreetmap.org/?lat=42.975657&lon=-89.513254
 +X14 http://www.openstreetmap.org/?lat=42.990835&lon=-89.512531
-81 +US151BusVer_N http://www.openstreetmap.org/?lat=42.995294&lon=-89.504714
-83A +CRPD_DanE http://www.openstreetmap.org/?lat=43.015400&lon=-89.472843
+81 http://www.openstreetmap.org/?lat=42.995294&lon=-89.504714
+83A http://www.openstreetmap.org/?lat=43.015400&lon=-89.472843
 83B http://www.openstreetmap.org/?lat=43.023747&lon=-89.468787
 RayRd http://www.openstreetmap.org/?lat=43.030847&lon=-89.460940
 AttWay http://www.openstreetmap.org/?lat=43.034382&lon=-89.456054
-258(12) +US18/151 http://www.openstreetmap.org/?lat=43.036886&lon=-89.452786
+258(12) http://www.openstreetmap.org/?lat=43.036886&lon=-89.452786
 258A(12) http://www.openstreetmap.org/?lat=43.034852&lon=-89.443617
 259(12) +FroRd_B http://www.openstreetmap.org/?lat=43.035290&lon=-89.422852
-260(12) +FishHatRd http://www.openstreetmap.org/?lat=43.034768&lon=-89.406610
+260(12) http://www.openstreetmap.org/?lat=43.034768&lon=-89.406610
 261(12) +US12/18_E http://www.openstreetmap.org/?lat=43.036180&lon=-89.393864
 OlinAve http://www.openstreetmap.org/?lat=43.053931&lon=-89.396353
 FishHatRd_N http://www.openstreetmap.org/?lat=43.056888&lon=-89.398819
@@ -72,44 +72,44 @@ WI30 http://www.openstreetmap.org/?lat=43.107249&lon=-89.338760
 US51 http://www.openstreetmap.org/?lat=43.116883&lon=-89.324534
 97 +I-90 http://www.openstreetmap.org/?lat=43.137070&lon=-89.295673
 98A +AmPkwy http://www.openstreetmap.org/?lat=43.144264&lon=-89.287380
-98B +NelRd http://www.openstreetmap.org/?lat=43.149282&lon=-89.281147
-100 +CRC_Dan http://www.openstreetmap.org/?lat=43.161516&lon=-89.267470
+98B http://www.openstreetmap.org/?lat=43.149282&lon=-89.281147
+100 http://www.openstreetmap.org/?lat=43.161516&lon=-89.267470
 101 +US151BusSun_S http://www.openstreetmap.org/?lat=43.175952&lon=-89.249496
 102 +WI19 http://www.openstreetmap.org/?lat=43.187405&lon=-89.233274
 103 +US151BusSun_N http://www.openstreetmap.org/?lat=43.197073&lon=-89.210873
 +X16 http://www.openstreetmap.org/?lat=43.211651&lon=-89.170103
-108 +CRVV_Dan http://www.openstreetmap.org/?lat=43.240795&lon=-89.146800
-111 +CRV_Dan http://www.openstreetmap.org/?lat=43.267831&lon=-89.106760
+108 http://www.openstreetmap.org/?lat=43.240795&lon=-89.146800
+111 http://www.openstreetmap.org/?lat=43.267831&lon=-89.106760
 +X17 http://www.openstreetmap.org/?lat=43.307954&lon=-89.047219
 115 +US151BusCol_S http://www.openstreetmap.org/?lat=43.317060&lon=-89.045477
 +X18 http://www.openstreetmap.org/?lat=43.338253&lon=-89.043959
 118 +WI16/60 http://www.openstreetmap.org/?lat=43.347215&lon=-89.034147
 +X19 http://www.openstreetmap.org/?lat=43.354524&lon=-89.021864
-120 +US151BusCol_N http://www.openstreetmap.org/?lat=43.357731&lon=-88.994837
+120 http://www.openstreetmap.org/?lat=43.357731&lon=-88.994837
 CRS_Dod http://www.openstreetmap.org/?lat=43.379538&lon=-88.960633
 +X20 http://www.openstreetmap.org/?lat=43.422536&lon=-88.901196
 129 +US151BusBea_S http://www.openstreetmap.org/?lat=43.435657&lon=-88.865147
-130 +CRG_Dod http://www.openstreetmap.org/?lat=43.435626&lon=-88.844161
+130 http://www.openstreetmap.org/?lat=43.435626&lon=-88.844161
 +X21 http://www.openstreetmap.org/?lat=43.438102&lon=-88.828366
 132 +WI33 http://www.openstreetmap.org/?lat=43.456112&lon=-88.815408
 134 +IndDr http://www.openstreetmap.org/?lat=43.475734&lon=-88.815351
 135 +US151BusBea_N http://www.openstreetmap.org/?lat=43.486992&lon=-88.814764
-136 +CRA_Dod http://www.openstreetmap.org/?lat=43.508161&lon=-88.805022
+136 http://www.openstreetmap.org/?lat=43.508161&lon=-88.805022
 CRC_Dod http://www.openstreetmap.org/?lat=43.560227&lon=-88.775711
-142 +US151BusWau_S http://www.openstreetmap.org/?lat=43.581945&lon=-88.754661
-144 +WI26 http://www.openstreetmap.org/?lat=43.602646&lon=-88.725071
+142 http://www.openstreetmap.org/?lat=43.581945&lon=-88.754661
+144 http://www.openstreetmap.org/?lat=43.602646&lon=-88.725071
 146 +WI49 http://www.openstreetmap.org/?lat=43.633124&lon=-88.714986
-147 +US151BusWau_N http://www.openstreetmap.org/?lat=43.647036&lon=-88.710063
+147 http://www.openstreetmap.org/?lat=43.647036&lon=-88.710063
 148 +WI26_N http://www.openstreetmap.org/?lat=43.658216&lon=-88.684001
 CRAS_Fon http://www.openstreetmap.org/?lat=43.670790&lon=-88.650141
 +X22 http://www.openstreetmap.org/?lat=43.684664&lon=-88.635893
 +X23 http://www.openstreetmap.org/?lat=43.701978&lon=-88.594866
 CRTC_Fon http://www.openstreetmap.org/?lat=43.725956&lon=-88.575726
 160 +CRD_Fon http://www.openstreetmap.org/?lat=43.739414&lon=-88.503284
-161 +HicSt http://www.openstreetmap.org/?lat=43.736592&lon=-88.467150
+161 http://www.openstreetmap.org/?lat=43.736174&lon=-88.467214
 WI175 http://www.openstreetmap.org/?lat=43.737387&lon=-88.450028
-I-41 +US41 +163 http://www.openstreetmap.org/?lat=43.737275&lon=-88.444362
-US45_S +CRV_Fon http://www.openstreetmap.org/?lat=43.742390&lon=-88.420372
+I-41 +US41 http://www.openstreetmap.org/?lat=43.737275&lon=-88.444362
+US45_S http://www.openstreetmap.org/?lat=43.742390&lon=-88.420372
 *US45 http://www.openstreetmap.org/?lat=43.746855&lon=-88.407176
 +X24 http://www.openstreetmap.org/?lat=43.754760&lon=-88.396168
 *4thStRd http://www.openstreetmap.org/?lat=43.769208&lon=-88.396756
diff --git a/hwy_data/WI/usawi/wi.wi015.wpt b/hwy_data/WI/usawi/wi.wi015.wpt
index 28c2e6eaf15..1a943628f75 100644
--- a/hwy_data/WI/usawi/wi.wi015.wpt
+++ b/hwy_data/WI/usawi/wi.wi015.wpt
@@ -1,6 +1,9 @@
 US45 http://www.openstreetmap.org/?lat=44.371508&lon=-88.725779
-CRM http://www.openstreetmap.org/?lat=44.334838&lon=-88.638468
-CRJJ http://www.openstreetmap.org/?lat=44.330602&lon=-88.602247
+CroRd http://www.openstreetmap.org/?lat=44.359421&lon=-88.715286
++X02 http://www.openstreetmap.org/?lat=44.356812&lon=-88.694000
+CRJJ_W http://www.openstreetmap.org/?lat=44.348097&lon=-88.675418
++X01 http://www.openstreetmap.org/?lat=44.345458&lon=-88.635550
+CRJJ_E http://www.openstreetmap.org/?lat=44.329482&lon=-88.599823
 WI76 http://www.openstreetmap.org/?lat=44.300295&lon=-88.536758
 CRCB http://www.openstreetmap.org/?lat=44.287271&lon=-88.506031
-US41 http://www.openstreetmap.org/?lat=44.287978&lon=-88.466163
+US41 http://www.openstreetmap.org/?lat=44.287978&lon=-88.466163
\ No newline at end of file
diff --git a/hwy_data/WI/usawi/wi.wi022.wpt b/hwy_data/WI/usawi/wi.wi022.wpt
index ff18d2c865a..f34bdc4ca6d 100644
--- a/hwy_data/WI/usawi/wi.wi022.wpt
+++ b/hwy_data/WI/usawi/wi.wi022.wpt
@@ -46,7 +46,9 @@ WI54_E http://www.openstreetmap.org/?lat=44.400920&lon=-88.935528
 CRB_WauW http://www.openstreetmap.org/?lat=44.449651&lon=-88.927288
 CRB_WauE http://www.openstreetmap.org/?lat=44.453665&lon=-88.927031
 CRN_Wau http://www.openstreetmap.org/?lat=44.464232&lon=-88.919907
-WI110/161 http://www.openstreetmap.org/?lat=44.513706&lon=-88.920078
+WI110/161 http://www.openstreetmap.org/?lat=44.513278&lon=-88.919713
+SymRd http://www.openstreetmap.org/?lat=44.513553&lon=-88.904285
++X05b http://www.openstreetmap.org/?lat=44.517531&lon=-88.900166
 CRO_WauS http://www.openstreetmap.org/?lat=44.518281&lon=-88.880210
 CRO_WauN http://www.openstreetmap.org/?lat=44.530474&lon=-88.879480
 CRT_Wau http://www.openstreetmap.org/?lat=44.531851&lon=-88.818498
diff --git a/hwy_data/WI/usawi/wi.wi023.wpt b/hwy_data/WI/usawi/wi.wi023.wpt
index 5c60c4b2468..89ce3110bd1 100644
--- a/hwy_data/WI/usawi/wi.wi023.wpt
+++ b/hwy_data/WI/usawi/wi.wi023.wpt
@@ -92,9 +92,10 @@ CRI_Fon http://www.openstreetmap.org/?lat=43.784728&lon=-88.533754
 I-41 +US41 http://www.openstreetmap.org/?lat=43.784356&lon=-88.482428
 US45_N +US45 http://www.openstreetmap.org/?lat=43.783550&lon=-88.447022
 US151 http://www.openstreetmap.org/?lat=43.783581&lon=-88.400717
-CRK_Fon http://www.openstreetmap.org/?lat=43.783674&lon=-88.388467
+CRK_Fon http://www.openstreetmap.org/?lat=43.783667&lon=-88.386598
 CRUU_Fon http://www.openstreetmap.org/?lat=43.783612&lon=-88.361406
-CRW_Fon http://www.openstreetmap.org/?lat=43.783364&lon=-88.256350
+CRW_FonW http://www.openstreetmap.org/?lat=43.783354&lon=-88.261183
+CRW_FonE http://www.openstreetmap.org/?lat=43.782695&lon=-88.251261
 +X14 http://www.openstreetmap.org/?lat=43.768300&lon=-88.188260
 CRG_Fon http://www.openstreetmap.org/?lat=43.771714&lon=-88.170948
 +X15 http://www.openstreetmap.org/?lat=43.786080&lon=-88.110944
diff --git a/hwy_data/WI/usawi/wi.wi029buschi.wpt b/hwy_data/WI/usawi/wi.wi029buschi.wpt
index 44665d481e7..2f7e34349f0 100644
--- a/hwy_data/WI/usawi/wi.wi029buschi.wpt
+++ b/hwy_data/WI/usawi/wi.wi029buschi.wpt
@@ -6,3 +6,4 @@ US53 http://www.openstreetmap.org/?lat=44.923899&lon=-91.428161
 WI124_N http://www.openstreetmap.org/?lat=44.934988&lon=-91.390629
 CRJ http://www.openstreetmap.org/?lat=44.926888&lon=-91.383882
 WI124_S http://www.openstreetmap.org/?lat=44.920926&lon=-91.380636
+WI29_E http://www.openstreetmap.org/?lat=44.918504&lon=-91.365094
\ No newline at end of file
diff --git a/hwy_data/WI/usawi/wi.wi110.wpt b/hwy_data/WI/usawi/wi.wi110.wpt
index be950d26d4e..2116d7e8d38 100644
--- a/hwy_data/WI/usawi/wi.wi110.wpt
+++ b/hwy_data/WI/usawi/wi.wi110.wpt
@@ -1,5 +1,8 @@
 US10(267) +US10 http://www.openstreetmap.org/?lat=44.253345&lon=-88.850126
 WI96 http://www.openstreetmap.org/?lat=44.260130&lon=-88.850169
+CRH_N http://www.openstreetmap.org/?lat=44.260169&lon=-88.855233
+CRH_S http://www.openstreetmap.org/?lat=44.258417&lon=-88.868065
+WolfRivDr http://www.openstreetmap.org/?lat=44.263949&lon=-88.894458
 US10(264) +US10/49_E http://www.openstreetmap.org/?lat=44.263027&lon=-88.910980
 OldWI49 http://www.openstreetmap.org/?lat=44.268282&lon=-88.928318
 CRU http://www.openstreetmap.org/?lat=44.282484&lon=-88.931795
@@ -14,9 +17,17 @@ WI54_E http://www.openstreetmap.org/?lat=44.400920&lon=-88.935528
 CRB_W http://www.openstreetmap.org/?lat=44.449651&lon=-88.927288
 CRB_E http://www.openstreetmap.org/?lat=44.453665&lon=-88.927031
 CRN http://www.openstreetmap.org/?lat=44.464232&lon=-88.919907
-WI22/161 http://www.openstreetmap.org/?lat=44.513706&lon=-88.920078
+WI22/161 http://www.openstreetmap.org/?lat=44.513278&lon=-88.919713
+WI161_W http://www.openstreetmap.org/?lat=44.513844&lon=-88.920164
++X03 http://www.openstreetmap.org/?lat=44.556992&lon=-88.920422
++X04 http://www.openstreetmap.org/?lat=44.557497&lon=-88.930614
+CROO_W http://www.openstreetmap.org/?lat=44.568092&lon=-88.929477
++X05 http://www.openstreetmap.org/?lat=44.575123&lon=-88.925056
+CROO_E http://www.openstreetmap.org/?lat=44.575582&lon=-88.920894
 CRC_W http://www.openstreetmap.org/?lat=44.605074&lon=-88.920593
++X06 http://www.openstreetmap.org/?lat=44.605120&lon=-88.908684
 CRC_E http://www.openstreetmap.org/?lat=44.610390&lon=-88.900251
 CRG http://www.openstreetmap.org/?lat=44.649238&lon=-88.899736
-CRS http://www.openstreetmap.org/?lat=44.671033&lon=-88.889437
-US45 http://www.openstreetmap.org/?lat=44.682172&lon=-88.889630
+CRS http://www.openstreetmap.org/?lat=44.670927&lon=-88.889394
+SchSt http://www.openstreetmap.org/?lat=44.673467&lon=-88.887452
+US45 http://www.openstreetmap.org/?lat=44.682172&lon=-88.889630
\ No newline at end of file
diff --git a/hwy_data/WI/usawi/wi.wi161.wpt b/hwy_data/WI/usawi/wi.wi161.wpt
index 810e369d0bd..2adda56859c 100644
--- a/hwy_data/WI/usawi/wi.wi161.wpt
+++ b/hwy_data/WI/usawi/wi.wi161.wpt
@@ -9,4 +9,5 @@ CRG/J http://www.openstreetmap.org/?lat=44.508236&lon=-89.130599
 WI49_S http://www.openstreetmap.org/?lat=44.507081&lon=-89.122896
 +X02 http://www.openstreetmap.org/?lat=44.510967&lon=-89.102640
 CRE http://www.openstreetmap.org/?lat=44.510937&lon=-89.021401
-WI22/110 http://www.openstreetmap.org/?lat=44.513706&lon=-88.920078
+WI110_N http://www.openstreetmap.org/?lat=44.513844&lon=-88.920164
+WI22/110 http://www.openstreetmap.org/?lat=44.513278&lon=-88.919713
\ No newline at end of file
diff --git a/hwy_data/WI/usawi/wi.wi175.wpt b/hwy_data/WI/usawi/wi.wi175.wpt
index 21006b2bd4e..ffb0cd2e9bb 100644
--- a/hwy_data/WI/usawi/wi.wi175.wpt
+++ b/hwy_data/WI/usawi/wi.wi175.wpt
@@ -1,9 +1,9 @@
 WI59 http://www.openstreetmap.org/?lat=43.020651&lon=-87.969954
-CanSt  +GMBlvd http://www.openstreetmap.org/?lat=43.025326&lon=-87.969804
+CanSt +GMBlvd http://www.openstreetmap.org/?lat=43.026455&lon=-87.969675
 I-94 http://www.openstreetmap.org/?lat=43.033106&lon=-87.969890
 ToUS18 http://www.openstreetmap.org/?lat=43.039254&lon=-87.971778
-StaSt +46thSt http://www.openstreetmap.org/?lat=43.045856&lon=-87.973044
-WashBlvd http://www.openstreetmap.org/?lat=43.049808&lon=-87.971756
+MarDr +46thSt http://www.openstreetmap.org/?lat=43.045856&lon=-87.973044
+WashBlvd http://www.openstreetmap.org/?lat=43.052599&lon=-87.971842
 LloSt +LloydSt http://www.openstreetmap.org/?lat=43.057083&lon=-87.971864
 LisAve_E http://www.openstreetmap.org/?lat=43.059952&lon=-87.971756
 55thSt http://www.openstreetmap.org/?lat=43.065126&lon=-87.981863
@@ -32,9 +32,9 @@ OldWI144 http://www.openstreetmap.org/?lat=43.334379&lon=-88.285103
 SpurRd http://www.openstreetmap.org/?lat=43.346621&lon=-88.310313
 CRK http://www.openstreetmap.org/?lat=43.369774&lon=-88.333340
 CRW http://www.openstreetmap.org/?lat=43.377698&lon=-88.341150
-CRR http://www.openstreetmap.org/?lat=43.386415&lon=-88.352222
+CRR +WI83 http://www.openstreetmap.org/?lat=43.386415&lon=-88.352222
 WI33 http://www.openstreetmap.org/?lat=43.421363&lon=-88.375328
-CRD http://www.openstreetmap.org/?lat=43.477370&lon=-88.418398
+CRD http://www.openstreetmap.org/?lat=43.477775&lon=-88.416853
 CRP http://www.openstreetmap.org/?lat=43.507196&lon=-88.448696
 WI67/28 http://www.openstreetmap.org/?lat=43.519396&lon=-88.451185
 WI28_E http://www.openstreetmap.org/?lat=43.536463&lon=-88.446722
@@ -44,4 +44,4 @@ CRY http://www.openstreetmap.org/?lat=43.638777&lon=-88.451185
 CRF http://www.openstreetmap.org/?lat=43.660700&lon=-88.451357
 CRB_E http://www.openstreetmap.org/?lat=43.689691&lon=-88.451700
 CRB_W http://www.openstreetmap.org/?lat=43.697029&lon=-88.451743
-US151 http://www.openstreetmap.org/?lat=43.737387&lon=-88.450028
+US151 http://www.openstreetmap.org/?lat=43.737387&lon=-88.450028
\ No newline at end of file
diff --git a/hwy_data/_systems/usamo.csv b/hwy_data/_systems/usamo.csv
index 69287b51c22..6a26e6b3c59 100644
--- a/hwy_data/_systems/usamo.csv
+++ b/hwy_data/_systems/usamo.csv
@@ -1,4 +1,4 @@
-systemName;region;route;banner;abbrev;city;root;altRouteNames
+last modified 12-26-23
 usamo;MO;MO1;;;;mo.mo001;
 usamo;MO;MO2;;;;mo.mo002;
 usamo;MO;MO3;;;;mo.mo003;
@@ -44,6 +44,7 @@ usamo;MO;MO28;Spr;Vie;Vienna;mo.mo028sprvie;
 usamo;MO;MO30;;;;mo.mo030;
 usamo;MO;MO31;;;;mo.mo031;
 usamo;MO;MO32;;;;mo.mo032;
+usamo;MO;MO32;Bus;Par;Park Hills;mo.mo037buspar;
 usamo;MO;MO33;;;;mo.mo033;
 usamo;MO;MO34;;;;mo.mo034;
 usamo;MO;MO37;;;;mo.mo037;
@@ -218,4 +219,4 @@ usamo;MO;MO744;;;;mo.mo744;
 usamo;MO;MO752;;;;mo.mo752;
 usamo;MO;MO759;;;;mo.mo759;
 usamo;MO;MO763;;;;mo.mo763;
-usamo;MO;MO765;;;;mo.mo765;
+usamo;MO;MO765;;;;mo.mo765;
\ No newline at end of file
diff --git a/hwy_data/_systems/usamo_con.csv b/hwy_data/_systems/usamo_con.csv
index 837d86945ad..c50d775162f 100644
--- a/hwy_data/_systems/usamo_con.csv
+++ b/hwy_data/_systems/usamo_con.csv
@@ -44,6 +44,7 @@ usamo;MO28;Spr;Vienna;mo.mo028sprvie
 usamo;MO30;;;mo.mo030
 usamo;MO31;;;mo.mo031
 usamo;MO32;;;mo.mo032
+usamo;MO32;Bus;Park Hills;mo.mo037buspar
 usamo;MO33;;;mo.mo033
 usamo;MO34;;;mo.mo034
 usamo;MO37;;;mo.mo037