diff --git a/data/core.yaml b/data/core.yaml
index 78437166b..c5f526039 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -780,38 +780,120 @@ en:
     done: done
     ok: OK
     graph:
-      azaleamum_drive: Azaleamum Drive
-      city_hall: Three Rivers City Hall
-      conrail_rr: Conrail Railroad
-      e_michigan_ave: East Michigan Avenue
-      east_st: East Street
-      elm_st: Elm Street
-      fire_department: Three Rivers Fire Department
-      first_baptist_church: First Baptist Church
-      flower_st: Flower Street
-      foster_st: Foster Street
-      memory_isle_park: Memory Isle Park
-      millard_st: Millard Street
-      morris_ave: Morris Avenue
-      n_andrews_st: North Andrews Street
-      n_constantine_st: North Constantine Street
-      n_main_st: North Main Street
-      petting_zoo: Scidmore Park Petting Zoo
-      portage_ave: Portage Avenue
-      portage_river: Portage River
-      railroad_dr: Railroad Drive
-      riverwalk_trail: Riverwalk Trail
-      rocky_river: Rocky River
-      s_andrews_st: South Andrews Street
-      s_constantine_st: South Constantine Street
-      s_main_st: South Main Street
-      scidmore_park: Scidmore Park
-      south_st: South Street
-      spring_st: Spring Street
-      st_joseph_river: Saint Joseph River
-      w_michigan_ave: West Michigan Avenue
-      walnut_st: Walnut Street
-      water_st: Water Street
+      city: Three Rivers
+      state: MI
+      postcode: "49093"
+      name:
+        1st-avenue: 1st Avenue
+        2nd-avenue: 2nd Avenue
+        4th-avenue: 4th Avenue
+        5th-avenue: 5th Avenue
+        6th-avenue: 6th Avenue
+        6th-street: 6th Street
+        7th-avenue: 7th Avenue
+        8th-avenue: 8th Avenue
+        9th-avenue: 9th Avenue
+        10th-avenue: 10th Avenue
+        11th-avenue: 11th Avenue
+        access-point-employment: Access Point Employment
+        adams-street: Adams Street
+        andrews-elementary-school: Andrews Elementary School
+        andrews-street: Andrews Street
+        armitage-street: Armitage Street
+        barrows-school: Barrows School
+        battle-street: Battle Street
+        bennett-street: Bennett Street
+        bowman-park: Bowman Park
+        collins-drive: Collins Drive
+        conrail-railroad: Conrail Railroad
+        conservation-park: Conservation Park
+        constantine-street: Constantine Street
+        cushman-street: Cushman Street
+        dollar-tree: Dollar Tree
+        douglas-avenue: Douglas Avenue
+        east-street: East Street
+        elm-street: Elm Street
+        flower-street: Flower Street
+        foster-street: Foster Street
+        french-street: French Street
+        garden-street: Garden Street
+        gem-pawnbroker: Gem Pawnbroker
+        golden-finch-framing: Golden Finch Framing
+        grant-avenue: Grant Avenue
+        hoffman-pond: Hoffman Pond
+        hoffman-street: Hoffman Street
+        hook-avenue: Hook Avenue
+        jefferson-street: Jefferson Street
+        kelsey-street: Kelsey Street
+        lafayette-park: LaFayette Park
+        las-coffee-cafe: L.A.'s Coffee Cafe
+        lincoln-avenue: Lincoln Avenue
+        lowrys-books: Lowry's Books
+        lynns-garage: Lynn's Garage
+        main-street-barbell: Main Street Barbell
+        main-street-cafe: Main Street Cafe
+        main-street-fitness: Main Street Fitness
+        main-street: Main Street
+        maple-street: Maple Street
+        marina-park: Marina Park
+        market-street: Market Street
+        memory-isle-park: Memory Isle Park
+        memory-isle: Memory Isle
+        michigan-avenue: Michigan Avenue
+        middle-street: Middle Street
+        millard-street: Millard Street
+        moore-street: Moore Street
+        morris-avenue: Morris Avenue
+        mural-mall: Mural Mall
+        paisanos-bar-and-grill: Paisano's Bar and Grill
+        paisley-emporium: Paisley Emporium
+        paparazzi-tattoo: Paparazzi Tattoo
+        pealer-street: Pealer Street
+        pine-river-road: Pine River Road
+        pine-street: Pine Street
+        pizza-hut: Pizza Hut
+        portage-avenue: Portage Avenue
+        portage-river: Portage River
+        preferred-insurance-services: Preferred Insurance Services
+        railroad-drive: Railroad Drive
+        raisin-river-road: Raisin River Road
+        river-city-appliance: River City Appliance
+        river-drive: River Drive
+        river-road: River Road
+        river-street: River Street
+        riverside-cemetery: Riverside Cemetery
+        riverwalk-trail: Riverwalk Trail
+        riviera-theatre: Riviera Theatre
+        rocky-river: Rocky River
+        sable-river-road: Sable River Road
+        saint-joseph-river: Saint Joseph River
+        scidmore-park-petting-zoo: Scidmore Park Petting Zoo
+        scidmore-park: Scidmore Park
+        scouter-park: Scouter Park
+        sherwin-williams: Sherwin-Williams
+        shiawassee-river-road: Shiawassee River Road
+        south-street: South Street
+        southern-michigan-bank: Southern Michigan Bank
+        spring-street: Spring Street
+        sturgeon-river-road: Sturgeon River Road
+        three-rivers-city-hall: Three Rivers City Hall
+        three-rivers-elementary-school: Three Rivers Elementary School
+        three-rivers-fire-department: Three Rivers Fire Department
+        three-rivers-high-school: Three Rivers High School
+        three-rivers-middle-school: Three Rivers Middle School
+        three-rivers-post-office: Three Rivers Post Office
+        three-rivers-public-library: Three Rivers Public Library
+        three-rivers: Three Rivers
+        unique-jewelry: Unique Jewelry
+        walnut-street: Walnut Street
+        washington-street: Washington Street
+        water-street: Water Street
+        west-street: West Street
+        wheeler-street: Wheeler Street
+        william-towing: William Towing
+        willow-drive: Willow Drive
+        wood-street: Wood Street
+        world-fare: World Fare
     welcome:
       title: "Welcome"
       welcome: "Welcome!  This walkthrough will teach you the basics of editing on OpenStreetMap."
diff --git a/data/intro_graph.json b/data/intro_graph.json
index 4c48f0c8d..f7667dd28 100644
--- a/data/intro_graph.json
+++ b/data/intro_graph.json
@@ -8,29 +8,17 @@
       "id": "n1631",
       "loc": [-85.639455, 41.94261]
     },
-    "n1632": {
-      "id": "n1632",
-      "loc": [-85.641094, 41.94006]
-    },
     "n1633": {
       "id": "n1633",
       "loc": [-85.641825, 41.941316]
     },
-    "n1634": {
-      "id": "n1634",
-      "loc": [-85.641838, 41.941556]
-    },
-    "n1635": {
-      "id": "n1635",
-      "loc": [-85.639932, 41.940067]
-    },
     "n1636": {
       "id": "n1636",
       "loc": [-85.640639, 41.941326]
     },
     "n1637": {
       "id": "n1637",
-      "loc": [-85.640612, 41.940066]
+      "loc": [-85.640611, 41.940037]
     },
     "n1638": {
       "id": "n1638",
@@ -38,11 +26,7 @@
     },
     "n1639": {
       "id": "n1639",
-      "loc": [-85.643071, 41.941288]
-    },
-    "n1640": {
-      "id": "n1640",
-      "loc": [-85.642213, 41.940043]
+      "loc": [-85.643078, 41.941293]
     },
     "n1641": {
       "id": "n1641",
@@ -50,19 +34,15 @@
     },
     "n1642": {
       "id": "n1642",
-      "loc": [-85.643103, 41.942575]
+      "loc": [-85.643097, 41.942575]
     },
     "n1643": {
       "id": "n1643",
-      "loc": [-85.641875, 41.942586]
-    },
-    "n1644": {
-      "id": "n1644",
-      "loc": [-85.638673, 41.940083]
+      "loc": [-85.641855, 41.942586]
     },
     "n1645": {
       "id": "n1645",
-      "loc": [-85.639362, 41.940072]
+      "loc": [-85.639362, 41.940051]
     },
     "n1646": {
       "id": "n1646",
@@ -118,15 +98,15 @@
     },
     "n1659": {
       "id": "n1659",
-      "loc": [-85.641955, 41.941096]
+      "loc": [-85.641962, 41.94109]
     },
     "n1660": {
       "id": "n1660",
-      "loc": [-85.642758, 41.941088]
+      "loc": [-85.642753, 41.941084]
     },
     "n1661": {
       "id": "n1661",
-      "loc": [-85.642754, 41.941005]
+      "loc": [-85.642752, 41.941004]
     },
     "n1662": {
       "id": "n1662",
@@ -134,19 +114,19 @@
     },
     "n1663": {
       "id": "n1663",
-      "loc": [-85.642799, 41.940734]
+      "loc": [-85.642803, 41.940731]
     },
     "n1664": {
       "id": "n1664",
-      "loc": [-85.642738, 41.940734]
+      "loc": [-85.642741, 41.940732]
     },
     "n1665": {
       "id": "n1665",
-      "loc": [-85.642742, 41.940644]
+      "loc": [-85.64274, 41.940645]
     },
     "n1666": {
       "id": "n1666",
-      "loc": [-85.641952, 41.940648]
+      "loc": [-85.641957, 41.940651]
     },
     "n1667": {
       "id": "n1667",
@@ -174,7 +154,7 @@
     },
     "n1673": {
       "id": "n1673",
-      "loc": [-85.64307, 41.941173]
+      "loc": [-85.643074, 41.941173]
     },
     "n1674": {
       "id": "n1674",
@@ -186,7 +166,7 @@
     },
     "n1676": {
       "id": "n1676",
-      "loc": [-85.643062, 41.940552]
+      "loc": [-85.643065, 41.940552]
     },
     "n1677": {
       "id": "n1677",
@@ -214,15 +194,7 @@
     },
     "n1683": {
       "id": "n1683",
-      "loc": [-85.64278, 41.941294]
-    },
-    "n1684": {
-      "id": "n1684",
-      "loc": [-85.64277, 41.941178]
-    },
-    "n1685": {
-      "id": "n1685",
-      "loc": [-85.642732, 41.941157]
+      "loc": [-85.642776, 41.941302]
     },
     "n1686": {
       "id": "n1686",
@@ -622,27 +594,27 @@
     },
     "n1785": {
       "id": "n1785",
-      "loc": [-85.643254, 41.941847]
+      "loc": [-85.643235, 41.941833]
     },
     "n1786": {
       "id": "n1786",
-      "loc": [-85.643394, 41.94186]
+      "loc": [-85.64335, 41.941842]
     },
     "n1787": {
       "id": "n1787",
-      "loc": [-85.643483, 41.941899]
+      "loc": [-85.643504, 41.941903]
     },
     "n1788": {
       "id": "n1788",
-      "loc": [-85.643568, 41.941977]
+      "loc": [-85.643554, 41.941946]
     },
     "n1789": {
       "id": "n1789",
-      "loc": [-85.643599, 41.942028]
+      "loc": [-85.643618, 41.942015]
     },
     "n1790": {
       "id": "n1790",
-      "loc": [-85.643438, 41.941957]
+      "loc": [-85.64346, 41.941971]
     },
     "n1791": {
       "id": "n1791",
@@ -666,11 +638,7 @@
     },
     "n1796": {
       "id": "n1796",
-      "loc": [-85.643386, 41.942079]
-    },
-    "n1797": {
-      "id": "n1797",
-      "loc": [-85.643377, 41.942031]
+      "loc": [-85.643398, 41.942031]
     },
     "n1798": {
       "id": "n1798",
@@ -710,7 +678,7 @@
     },
     "n1807": {
       "id": "n1807",
-      "loc": [-85.643524, 41.942144]
+      "loc": [-85.643522, 41.942125]
     },
     "n1808": {
       "id": "n1808",
@@ -718,15 +686,11 @@
     },
     "n1809": {
       "id": "n1809",
-      "loc": [-85.643353, 41.941927]
+      "loc": [-85.643346, 41.941924]
     },
     "n1810": {
       "id": "n1810",
-      "loc": [-85.643254, 41.941919]
-    },
-    "n1811": {
-      "id": "n1811",
-      "loc": [-85.643087, 41.94192]
+      "loc": [-85.643086, 41.94192]
     },
     "n1812": {
       "id": "n1812",
@@ -734,7 +698,7 @@
     },
     "n1813": {
       "id": "n1813",
-      "loc": [-85.643297, 41.941922]
+      "loc": [-85.643295, 41.941919]
     },
     "n1814": {
       "id": "n1814",
@@ -750,7 +714,7 @@
     },
     "n1817": {
       "id": "n1817",
-      "loc": [-85.643613, 41.942267]
+      "loc": [-85.643608, 41.942271]
     },
     "n1818": {
       "id": "n1818",
@@ -786,7 +750,7 @@
     },
     "n1826": {
       "id": "n1826",
-      "loc": [-85.636968, 41.940108]
+      "loc": [-85.636967, 41.940078]
     },
     "n1827": {
       "id": "n1827",
@@ -794,16 +758,12 @@
     },
     "n1828": {
       "id": "n1828",
-      "loc": [-85.637255, 41.940106]
+      "loc": [-85.637254, 41.940075]
     },
     "n1829": {
       "id": "n1829",
       "loc": [-85.637002, 41.941355]
     },
-    "n1830": {
-      "id": "n1830",
-      "loc": [-85.634992, 41.940118]
-    },
     "n1831": {
       "id": "n1831",
       "loc": [-85.638235, 41.942615]
@@ -828,21 +788,13 @@
       "id": "n1835",
       "loc": [-85.634873, 41.943044]
     },
-    "n1836": {
-      "id": "n1836",
-      "loc": [-85.641946, 41.946413]
-    },
-    "n1837": {
-      "id": "n1837",
-      "loc": [-85.643157, 41.946389]
-    },
     "n1838": {
       "id": "n1838",
-      "loc": [-85.641889, 41.943851]
+      "loc": [-85.641885, 41.943851]
     },
     "n1839": {
       "id": "n1839",
-      "loc": [-85.641922, 41.945121]
+      "loc": [-85.641915, 41.945121]
     },
     "n1840": {
       "id": "n1840",
@@ -854,7 +806,7 @@
     },
     "n1842": {
       "id": "n1842",
-      "loc": [-85.635769, 41.940122]
+      "loc": [-85.635768, 41.940092]
     },
     "n1843": {
       "id": "n1843",
@@ -866,23 +818,19 @@
     },
     "n1845": {
       "id": "n1845",
-      "loc": [-85.643139, 41.945103]
+      "loc": [-85.643137, 41.945103]
     },
     "n1846": {
       "id": "n1846",
-      "loc": [-85.638194, 41.940094]
+      "loc": [-85.638193, 41.940065]
     },
     "n1847": {
       "id": "n1847",
       "loc": [-85.640688, 41.943861]
     },
-    "n1848": {
-      "id": "n1848",
-      "loc": [-85.640734, 41.945887]
-    },
     "n1849": {
       "id": "n1849",
-      "loc": [-85.643121, 41.943841]
+      "loc": [-85.643117, 41.943841]
     },
     "n1850": {
       "id": "n1850",
@@ -941,7 +889,7 @@
         "highway": "service",
         "service": "parking_aisle"
       },
-      "nodes": ["n1813", "n1814", "n1815", "n1816", "n1817"]
+      "nodes": ["n1813", "n1635", "n1814", "n1634", "n1815", "n1632", "n1816", "n1817"]
     },
     "w339": {
       "id": "w339",
@@ -949,7 +897,7 @@
         "highway": "residential",
         "name": "Millard Street"
       },
-      "nodes": ["n1827", "n1830", "n1842", "n1826", "n1828", "n1846", "n1644", "n1645", "n1635", "n1637", "n1632", "n1640", "n1641"]
+      "nodes": ["n1827", "n1842", "n1826", "n1828", "n1846", "n1645", "n1637", "n1641"]
     },
     "w340": {
       "id": "w340",
@@ -999,22 +947,20 @@
       "id": "w346",
       "tags": {
         "highway": "residential",
-        "name": "South Douglas Avenue"
+        "name": "Douglas Avenue"
       },
-      "nodes": ["n1641", "n1676", "n1673", "n1639", "n1811", "n1642"]
+      "nodes": ["n1641", "n1676", "n1673", "n1639", "n1810", "n1642", "n1849", "n1845"]
     },
     "w347": {
       "id": "w347",
       "tags": {
         "highway": "primary",
-        "name": "West Michigan Avenue",
-        "old_ref": "US 131",
-        "ref": "US 131 Business;M 60",
-        "access": "yes"
+        "name": "Michigan Avenue"
       },
       "nodes": [
         "n1642",
         "n1643",
+        "n1031",
         "n1630",
         "n845",
         "n1631",
@@ -1076,9 +1022,9 @@
       "id": "w353",
       "tags": {
         "highway": "residential",
-        "name": "South Lincoln Avenue"
+        "name": "Lincoln Avenue"
       },
-      "nodes": ["n1637", "n1636", "n1630"]
+      "nodes": ["n1637", "n1636", "n1029", "n1630"]
     },
     "w354": {
       "id": "w354",
@@ -1098,7 +1044,7 @@
       "id": "w356",
       "tags": {
         "highway": "residential",
-        "name": "North Hook Avenue"
+        "name": "Hook Avenue"
       },
       "nodes": ["n1631", "n1840", "n1841"]
     },
@@ -1140,25 +1086,29 @@
         "n1859",
         "n1860",
         "n1804",
+        "n1640",
         "n1805",
         "n1817",
         "n1806",
+        "n1644",
+        "n1811",
         "n1807",
         "n1808",
+        "n3419",
         "n1812",
         "n1790",
+        "n3418",
+        "n3744",
         "n1809",
         "n1813",
-        "n1810",
-        "n1811"
+        "n1810"
       ]
     },
     "w362": {
       "id": "w362",
       "tags": {
         "highway": "residential",
-        "name": "South Street",
-        "oneway": "yes"
+        "name": "South Street"
       },
       "nodes": ["n1639", "n1683", "n1633"]
     },
@@ -1170,14 +1120,6 @@
       },
       "nodes": ["n1646", "n1647", "n1648", "n1649", "n1646"]
     },
-    "w364": {
-      "id": "w364",
-      "tags": {
-        "highway": "residential",
-        "name": "North Grant Avenue"
-      },
-      "nodes": ["n1643", "n1838", "n1839", "n1836"]
-    },
     "w365": {
       "id": "w365",
       "tags": {
@@ -1208,30 +1150,15 @@
       "tags": {
         "amenity": "parking"
       },
-      "nodes": [
-        "n1791",
-        "n1792",
-        "n1793",
-        "n1794",
-        "n1795",
-        "n1796",
-        "n1797",
-        "n1798",
-        "n1799",
-        "n1800",
-        "n1801",
-        "n1802",
-        "n1803",
-        "n1791"
-      ]
+      "nodes": ["n1791", "n1792", "n1793", "n1794", "n1795", "n1796", "n1798", "n1799", "n1800", "n1801", "n1802", "n1803", "n1791"]
     },
     "w367": {
       "id": "w367",
       "tags": {
         "highway": "residential",
-        "name": "South Grant Avenue"
+        "name": "Grant Avenue"
       },
-      "nodes": ["n1633", "n1634", "n1643"]
+      "nodes": ["n1633", "n1643", "n1838", "n1839"]
     },
     "w368": {
       "id": "w368",
@@ -1253,18 +1180,10 @@
       "id": "w370",
       "tags": {
         "highway": "residential",
-        "name": "South Hook Avenue"
+        "name": "Hook Avenue"
       },
       "nodes": ["n1645", "n1638", "n858", "n1631"]
     },
-    "w371": {
-      "id": "w371",
-      "tags": {
-        "highway": "residential",
-        "name": "North Douglas Avenue"
-      },
-      "nodes": ["n1642", "n1849", "n1845", "n1837"]
-    },
     "w372": {
       "id": "w372",
       "tags": {
@@ -1277,7 +1196,7 @@
       "tags": {
         "amenity": "parking"
       },
-      "nodes": ["n1810", "n1785", "n1786", "n1787", "n1788", "n1789", "n1808", "n1812", "n1790", "n1809", "n1810"]
+      "nodes": ["n2891", "n1785", "n1786", "n3394", "n1787", "n1788", "n1789", "n1830", "n1836", "n1837", "n1848", "n3409", "n2891"]
     },
     "w374": {
       "id": "w374",
@@ -1299,14 +1218,15 @@
       "tags": {
         "amenity": "parking"
       },
-      "nodes": ["n1677", "n1678", "n1679", "n1680", "n1681", "n1682", "n1685", "n1677"]
+      "nodes": ["n1677", "n1678", "n1679", "n1680", "n1681", "n1682", "n1677"]
     },
     "w377": {
       "id": "w377",
       "tags": {
-        "highway": "service"
+        "highway": "service",
+        "oneway": "yes"
       },
-      "nodes": ["n1673", "n1674", "n1675", "n1676"]
+      "nodes": ["n1676", "n1675", "n1674", "n1673"]
     },
     "w378": {
       "id": "w378",
@@ -1320,538 +1240,18 @@
       "id": "w379",
       "tags": {
         "highway": "residential",
-        "name": "North Lincoln Avenue"
+        "name": "Lincoln Avenue"
       },
-      "nodes": ["n1630", "n1847", "n1844", "n1848"]
+      "nodes": ["n1630", "n1847", "n1844"]
     },
     "w380": {
       "id": "w380",
       "tags": {
         "highway": "service",
-        "service": "parking_aisle"
+        "service": "parking_aisle",
+        "oneway": "yes"
       },
-      "nodes": ["n1683", "n1684", "n1685", "n1686"]
-    },
-    "r1": {
-      "id": "r1",
-      "tags": {
-        "modifier": "Business",
-        "name": "US 131 Business (Three Rivers, MI)",
-        "network": "US:US",
-        "ref": "131",
-        "route": "road",
-        "type": "route"
-      },
-      "members": [
-        {
-          "id": "w17966509",
-          "type": "way",
-          "role": "forward"
-        },
-        {
-          "id": "w228",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w497",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w489",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w392",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w395",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w347",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17965146",
-          "type": "way",
-          "role": "forward"
-        },
-        {
-          "id": "w17964031",
-          "type": "way",
-          "role": "forward"
-        }
-      ]
-    },
-    "r3": {
-      "id": "r3",
-      "tags": {
-        "network": "US:MI",
-        "ref": "60",
-        "route": "road",
-        "state_id": "MI",
-        "type": "route",
-        "url": "http://en.wikipedia.org/wiki/M-60_%28Michigan_highway%29"
-      },
-      "members": [
-        {
-          "id": "w17751087",
-          "type": "way",
-          "role": "east"
-        },
-        {
-          "id": "w117148312",
-          "type": "way",
-          "role": "east"
-        },
-        {
-          "id": "w40942155",
-          "type": "way",
-          "role": "west"
-        },
-        {
-          "id": "w17751017",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17751083",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17747780",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w41068082",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w197025212",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17743874",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17751044",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17752167",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17751089",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17743879",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17751064",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w197057073",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w167699963",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w167699972",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17967584",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w167699964",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17967582",
-          "type": "way",
-          "role": "west"
-        },
-        {
-          "id": "w41260270",
-          "type": "way",
-          "role": "west"
-        },
-        {
-          "id": "w17965146",
-          "type": "way",
-          "role": "west"
-        },
-        {
-          "id": "w347",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w395",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w392",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w489",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w497",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w536",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w529",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w517",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w619",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w625",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w670",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17967581",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w41074902",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w41074906",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w209707997",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w209707998",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17964798",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17966034",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17967593",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w41074888",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17733772",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w41074813",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17742213",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17746863",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17745772",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17742222",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17745922",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17742198",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17747675",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17739927",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17745708",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w41006323",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17744233",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17739436",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17742201",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w151418616",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17750062",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17742227",
-          "type": "way",
-          "role": "east"
-        },
-        {
-          "id": "w41006348",
-          "type": "way",
-          "role": "east"
-        },
-        {
-          "id": "w41260984",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17832427",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17838408",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17835846",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17832923",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17839388",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17838390",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17831272",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17828581",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w38240686",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17838405",
-          "type": "way",
-          "role": "east"
-        },
-        {
-          "id": "w123323711",
-          "type": "way",
-          "role": "east"
-        },
-        {
-          "id": "w17830167",
-          "type": "way",
-          "role": "east"
-        },
-        {
-          "id": "w99011909",
-          "type": "way",
-          "role": "east"
-        },
-        {
-          "id": "w41911361",
-          "type": "way",
-          "role": "east"
-        },
-        {
-          "id": "w41911355",
-          "type": "way",
-          "role": "east"
-        },
-        {
-          "id": "w41911356",
-          "type": "way",
-          "role": "east"
-        },
-        {
-          "id": "w117148326",
-          "type": "way",
-          "role": "west"
-        },
-        {
-          "id": "w41911352",
-          "type": "way",
-          "role": "west"
-        },
-        {
-          "id": "w41911353",
-          "type": "way",
-          "role": "west"
-        },
-        {
-          "id": "w41911354",
-          "type": "way",
-          "role": "west"
-        },
-        {
-          "id": "w41911360",
-          "type": "way",
-          "role": "west"
-        },
-        {
-          "id": "w38240676",
-          "type": "way",
-          "role": "west"
-        },
-        {
-          "id": "w123323710",
-          "type": "way",
-          "role": "west"
-        },
-        {
-          "id": "w41260271",
-          "type": "way",
-          "role": "east"
-        },
-        {
-          "id": "w41260273",
-          "type": "way",
-          "role": "east"
-        },
-        {
-          "id": "w17964031",
-          "type": "way",
-          "role": "east"
-        },
-        {
-          "id": "w41006344",
-          "type": "way",
-          "role": "west"
-        },
-        {
-          "id": "w41006351",
-          "type": "way",
-          "role": "west"
-        }
-      ]
+      "nodes": ["n1683", "n3745", "n1686", "n1633"]
     },
     "n1862": {
       "id": "n1862",
@@ -1860,7 +1260,7 @@
         "amenity": "fire_station",
         "name": "Three Rivers Fire Department",
         "addr:housenumber": "333",
-        "addr:street": "West Michigan Avenue",
+        "addr:street": "Michigan Avenue",
         "addr:city": "Three Rivers",
         "addr:state": "MI",
         "addr:postcode": "49093"
@@ -2665,7 +2065,7 @@
         "amenity": "townhall",
         "name": "Three Rivers City Hall",
         "addr:housenumber": "333",
-        "addr:street": "West Michigan Avenue",
+        "addr:street": "Michigan Avenue",
         "addr:city": "Three Rivers",
         "addr:state": "MI",
         "addr:postcode": "49093"
@@ -2851,7 +2251,7 @@
     },
     "n2105": {
       "id": "n2105",
-      "loc": [-85.629533, 41.942686]
+      "loc": [-85.629597, 41.942562]
     },
     "n2106": {
       "id": "n2106",
@@ -2863,7 +2263,7 @@
     },
     "n2108": {
       "id": "n2108",
-      "loc": [-85.629694, 41.943053]
+      "loc": [-85.629708, 41.942872]
     },
     "n2109": {
       "id": "n2109",
@@ -2915,7 +2315,7 @@
     },
     "n2121": {
       "id": "n2121",
-      "loc": [-85.629415, 41.941792]
+      "loc": [-85.629518, 41.941783]
     },
     "n2122": {
       "id": "n2122",
@@ -2943,7 +2343,7 @@
     },
     "n2128": {
       "id": "n2128",
-      "loc": [-85.629984, 41.943444]
+      "loc": [-85.630097, 41.943449]
     },
     "n2129": {
       "id": "n2129",
@@ -3069,42 +2469,14 @@
       "id": "n2159",
       "loc": [-85.62934, 41.940843]
     },
-    "n2160": {
-      "id": "n2160",
-      "loc": [-85.640505, 41.949279]
-    },
-    "n2161": {
-      "id": "n2161",
-      "loc": [-85.640688, 41.949511]
-    },
     "n2162": {
       "id": "n2162",
       "loc": [-85.637225, 41.944128]
     },
-    "n2163": {
-      "id": "n2163",
-      "loc": [-85.64043, 41.950285]
-    },
     "n2164": {
       "id": "n2164",
       "loc": [-85.635441, 41.943989]
     },
-    "n2165": {
-      "id": "n2165",
-      "loc": [-85.640198, 41.948623]
-    },
-    "n2166": {
-      "id": "n2166",
-      "loc": [-85.638953, 41.947099]
-    },
-    "n2167": {
-      "id": "n2167",
-      "loc": [-85.640906, 41.950857]
-    },
-    "n2168": {
-      "id": "n2168",
-      "loc": [-85.638996, 41.947825]
-    },
     "n2169": {
       "id": "n2169",
       "loc": [-85.637469, 41.944579]
@@ -3117,34 +2489,10 @@
       "id": "n2171",
       "loc": [-85.638263, 41.946367]
     },
-    "n2172": {
-      "id": "n2172",
-      "loc": [-85.640108, 41.948545]
-    },
-    "n2173": {
-      "id": "n2173",
-      "loc": [-85.64037, 41.950459]
-    },
-    "n2174": {
-      "id": "n2174",
-      "loc": [-85.639898, 41.94915]
-    },
-    "n2175": {
-      "id": "n2175",
-      "loc": [-85.641245, 41.951019]
-    },
-    "n2176": {
-      "id": "n2176",
-      "loc": [-85.640584, 41.950147]
-    },
     "n2177": {
       "id": "n2177",
       "loc": [-85.637136, 41.94576]
     },
-    "n2178": {
-      "id": "n2178",
-      "loc": [-85.639183, 41.948593]
-    },
     "n2179": {
       "id": "n2179",
       "loc": [-85.637129, 41.945415]
@@ -3153,34 +2501,14 @@
       "id": "n2180",
       "loc": [-85.637473, 41.94607]
     },
-    "n2181": {
-      "id": "n2181",
-      "loc": [-85.638777, 41.948204]
-    },
-    "n2182": {
-      "id": "n2182",
-      "loc": [-85.639758, 41.949014]
-    },
     "n2183": {
       "id": "n2183",
       "loc": [-85.637769, 41.946095]
     },
-    "n2184": {
-      "id": "n2184",
-      "loc": [-85.642501, 41.952287]
-    },
-    "n2185": {
-      "id": "n2185",
-      "loc": [-85.640863, 41.94994]
-    },
     "n2186": {
       "id": "n2186",
       "loc": [-85.631385, 41.94433]
     },
-    "n2187": {
-      "id": "n2187",
-      "loc": [-85.643266, 41.95298]
-    },
     "n2188": {
       "id": "n2188",
       "loc": [-85.637308, 41.944882]
@@ -3189,62 +2517,14 @@
       "id": "n2189",
       "loc": [-85.634898, 41.944041]
     },
-    "n2190": {
-      "id": "n2190",
-      "loc": [-85.642011, 41.951503]
-    },
-    "n2191": {
-      "id": "n2191",
-      "loc": [-85.639797, 41.948888]
-    },
-    "n2192": {
-      "id": "n2192",
-      "loc": [-85.639039, 41.947466]
-    },
-    "n2193": {
-      "id": "n2193",
-      "loc": [-85.640155, 41.948719]
-    },
-    "n2194": {
-      "id": "n2194",
-      "loc": [-85.639937, 41.948785]
-    },
-    "n2195": {
-      "id": "n2195",
-      "loc": [-85.640205, 41.949183]
-    },
     "n2196": {
       "id": "n2196",
       "loc": [-85.637435, 41.944342]
     },
-    "n2197": {
-      "id": "n2197",
-      "loc": [-85.639443, 41.948593]
-    },
-    "n2198": {
-      "id": "n2198",
-      "loc": [-85.638835, 41.948049]
-    },
-    "n2199": {
-      "id": "n2199",
-      "loc": [-85.638842, 41.948441]
-    },
     "n2200": {
       "id": "n2200",
       "loc": [-85.637169, 41.945098]
     },
-    "n2201": {
-      "id": "n2201",
-      "loc": [-85.639883, 41.948529]
-    },
-    "n2202": {
-      "id": "n2202",
-      "loc": [-85.641775, 41.951336]
-    },
-    "n2203": {
-      "id": "n2203",
-      "loc": [-85.640627, 41.95077]
-    },
     "n2204": {
       "id": "n2204",
       "loc": [-85.635894, 41.943719]
@@ -3253,22 +2533,6 @@
       "id": "n2205",
       "loc": [-85.637297, 41.945992]
     },
-    "n2206": {
-      "id": "n2206",
-      "loc": [-85.641432, 41.951209]
-    },
-    "n2207": {
-      "id": "n2207",
-      "loc": [-85.640863, 41.949756]
-    },
-    "n2208": {
-      "id": "n2208",
-      "loc": [-85.640788, 41.950052]
-    },
-    "n2209": {
-      "id": "n2209",
-      "loc": [-85.64278, 41.952878]
-    },
     "n2210": {
       "id": "n2210",
       "loc": [-85.635175, 41.94408]
@@ -3277,22 +2541,10 @@
       "id": "n2211",
       "loc": [-85.636381, 41.943761]
     },
-    "n2212": {
-      "id": "n2212",
-      "loc": [-85.642329, 41.952008]
-    },
     "n2213": {
       "id": "n2213",
       "loc": [-85.638578, 41.946644]
     },
-    "n2214": {
-      "id": "n2214",
-      "loc": [-85.640434, 41.95065]
-    },
-    "n2215": {
-      "id": "n2215",
-      "loc": [-85.642623, 41.952708]
-    },
     "n2216": {
       "id": "n2216",
       "loc": [-85.636126, 41.943713]
@@ -3784,7 +3036,7 @@
       "id": "w387",
       "tags": {
         "highway": "residential",
-        "name": "South Andrews Street"
+        "name": "Andrews Street"
       },
       "nodes": ["n1846", "n1843", "n865", "n157", "n1831"]
     },
@@ -3832,7 +3084,7 @@
       "id": "w391",
       "tags": {
         "highway": "residential",
-        "name": "North Constantine Street"
+        "name": "Constantine Street"
       },
       "nodes": [
         "n2089",
@@ -3859,9 +3111,7 @@
       "id": "w392",
       "tags": {
         "highway": "primary",
-        "name": "West Michigan Avenue",
-        "old_ref": "US 131",
-        "ref": "US 131 Business;M 60"
+        "name": "Michigan Avenue"
       },
       "nodes": ["n1869", "n212", "n436", "n2281", "n2081"]
     },
@@ -3869,7 +3119,7 @@
       "id": "w393",
       "tags": {
         "highway": "tertiary",
-        "name": "South Constantine Street"
+        "name": "Constantine Street"
       },
       "nodes": ["n1829", "n611", "n144", "n602", "n1832"]
     },
@@ -3886,9 +3136,7 @@
       "tags": {
         "bridge": "yes",
         "highway": "primary",
-        "name": "West Michigan Avenue",
-        "old_ref": "US 131",
-        "ref": "US 131 Business;M 60"
+        "name": "Michigan Avenue"
       },
       "nodes": ["n1835", "n1869"]
     },
@@ -4082,7 +3330,7 @@
       "id": "w413",
       "tags": {
         "highway": "residential",
-        "name": "North Andrews Street"
+        "name": "Andrews Street"
       },
       "nodes": ["n1831", "n876", "n821", "n2089"]
     },
@@ -5965,7 +5213,7 @@
     },
     "n2745": {
       "id": "n2745",
-      "loc": [-85.629599, 41.952435]
+      "loc": [-85.629586, 41.952469]
     },
     "n2746": {
       "id": "n2746",
@@ -5973,7 +5221,7 @@
     },
     "n2747": {
       "id": "n2747",
-      "loc": [-85.634767, 41.959009]
+      "loc": [-85.63478, 41.959007]
     },
     "n2748": {
       "id": "n2748",
@@ -5987,10 +5235,6 @@
       "id": "n2749",
       "loc": [-85.634648, 41.947325]
     },
-    "n2750": {
-      "id": "n2750",
-      "loc": [-85.636166, 41.947296]
-    },
     "n2751": {
       "id": "n2751",
       "loc": [-85.633195, 41.94734]
@@ -6009,11 +5253,11 @@
     },
     "n2755": {
       "id": "n2755",
-      "loc": [-85.634641, 41.948627]
+      "loc": [-85.634655, 41.948612]
     },
     "n2756": {
       "id": "n2756",
-      "loc": [-85.636182, 41.948614]
+      "loc": [-85.636182, 41.948605]
     },
     "n2757": {
       "id": "n2757",
@@ -6021,7 +5265,7 @@
     },
     "n2758": {
       "id": "n2758",
-      "loc": [-85.634686, 41.951158]
+      "loc": [-85.634686, 41.951159]
     },
     "n2759": {
       "id": "n2759",
@@ -6029,15 +5273,15 @@
     },
     "n2760": {
       "id": "n2760",
-      "loc": [-85.634668, 41.949875]
+      "loc": [-85.634668, 41.949891]
     },
     "n2761": {
       "id": "n2761",
-      "loc": [-85.634686, 41.952415]
+      "loc": [-85.634701, 41.952422]
     },
     "n2762": {
       "id": "n2762",
-      "loc": [-85.634726, 41.955921]
+      "loc": [-85.634747, 41.955907]
     },
     "n2763": {
       "id": "n2763",
@@ -6049,7 +5293,7 @@
     },
     "n2765": {
       "id": "n2765",
-      "loc": [-85.632278, 41.948613]
+      "loc": [-85.632278, 41.948624]
     },
     "n2766": {
       "id": "n2766",
@@ -6057,7 +5301,7 @@
     },
     "n2767": {
       "id": "n2767",
-      "loc": [-85.636233, 41.952398]
+      "loc": [-85.636233, 41.95241]
     },
     "n2768": {
       "id": "n2768",
@@ -6067,21 +5311,13 @@
       "id": "n2769",
       "loc": [-85.630486, 41.951194]
     },
-    "n2770": {
-      "id": "n2770",
-      "loc": [-85.626375, 41.957279]
-    },
-    "n2771": {
-      "id": "n2771",
-      "loc": [-85.625525, 41.95864]
-    },
     "n2772": {
       "id": "n2772",
-      "loc": [-85.636163, 41.947382]
+      "loc": [-85.636162, 41.94731]
     },
     "n2773": {
       "id": "n2773",
-      "loc": [-85.636188, 41.949874]
+      "loc": [-85.636188, 41.949881]
     },
     "n2774": {
       "id": "n2774",
@@ -6113,7 +5349,7 @@
     },
     "n2781": {
       "id": "n2781",
-      "loc": [-85.623684, 41.961482]
+      "loc": [-85.625129, 41.959272]
     },
     "n2782": {
       "id": "n2782",
@@ -6181,7 +5417,7 @@
     },
     "n2798": {
       "id": "n2798",
-      "loc": [-85.635418, 41.947309]
+      "loc": [-85.635418, 41.947317]
     },
     "n2799": {
       "id": "n2799",
@@ -6710,9 +5946,7 @@
       "tags": {
         "bridge": "yes",
         "highway": "primary",
-        "name": "West Michigan Avenue",
-        "old_ref": "US 131",
-        "ref": "US 131 Business;M 60"
+        "name": "Michigan Avenue"
       },
       "nodes": ["n2081", "n2430"]
     },
@@ -6739,8 +5973,6 @@
         "n2766",
         "n2763",
         "n2752",
-        "n2770",
-        "n2771",
         "n2781"
       ]
     },
@@ -6794,9 +6026,7 @@
       "id": "w497",
       "tags": {
         "highway": "primary",
-        "name": "West Michigan Avenue",
-        "old_ref": "US 131",
-        "ref": "US 131 Business;M 60"
+        "name": "Michigan Avenue"
       },
       "nodes": ["n2430", "n2446", "n343", "n2101", "n2560", "n2431", "n363", "n2748"]
     },
@@ -6813,7 +6043,7 @@
         "highway": "residential",
         "name": "West Street"
       },
-      "nodes": ["n2423", "n2415", "n661", "n2416", "n2417", "n2719", "n2721", "n2750", "n2772", "n2756", "n2773", "n2759", "n2767"]
+      "nodes": ["n2423", "n2415", "n661", "n2416", "n2417", "n2719", "n2721", "n2772", "n2756", "n2773", "n2759", "n2767"]
     },
     "w500": {
       "id": "w500",
@@ -7079,22 +6309,6 @@
       "id": "n2838",
       "loc": [-85.623074, 41.946339]
     },
-    "n2839": {
-      "id": "n2839",
-      "loc": [-85.618327, 41.945631]
-    },
-    "n2840": {
-      "id": "n2840",
-      "loc": [-85.615453, 41.945637]
-    },
-    "n2841": {
-      "id": "n2841",
-      "loc": [-85.617231, 41.945633]
-    },
-    "n2842": {
-      "id": "n2842",
-      "loc": [-85.616136, 41.945635]
-    },
     "n2843": {
       "id": "n2843",
       "loc": [-85.615273, 41.945637]
@@ -7145,7 +6359,7 @@
     },
     "n2855": {
       "id": "n2855",
-      "loc": [-85.629994, 41.944669]
+      "loc": [-85.630001, 41.944664]
     },
     "n2856": {
       "id": "n2856",
@@ -7185,19 +6399,15 @@
     },
     "n2865": {
       "id": "n2865",
-      "loc": [-85.630139, 41.944661]
-    },
-    "n2866": {
-      "id": "n2866",
-      "loc": [-85.630298, 41.944635]
+      "loc": [-85.630125, 41.944654]
     },
     "n2867": {
       "id": "n2867",
-      "loc": [-85.630759, 41.94454]
+      "loc": [-85.630257, 41.944637]
     },
     "n2868": {
       "id": "n2868",
-      "loc": [-85.631237, 41.944455]
+      "loc": [-85.631247, 41.944459]
     },
     "n2869": {
       "id": "n2869",
@@ -7276,11 +6486,11 @@
       "id": "w517",
       "tags": {
         "highway": "secondary",
-        "name": "East Michigan Avenue",
+        "name": "Michigan Avenue",
         "name_1": "State Highway 60",
         "ref": "M 60"
       },
-      "nodes": ["n2863", "n2815", "n2814", "n2812", "n2864", "n2855", "n2865", "n2866", "n2867", "n2868"]
+      "nodes": ["n2863", "n2815", "n2814", "n2812", "n2864", "n2855", "n2865", "n2867", "n2868"]
     },
     "w518": {
       "id": "w518",
@@ -7371,7 +6581,7 @@
         "highway": "residential",
         "name": "4th Avenue"
       },
-      "nodes": ["n2877", "n2809", "n2813", "n2844", "n2839", "n2841", "n2842", "n2840", "n2843"]
+      "nodes": ["n2877", "n2809", "n2813", "n2844", "n2843"]
     },
     "n2883": {
       "id": "n2883",
@@ -7383,15 +6593,15 @@
     },
     "n2884": {
       "id": "n2884",
-      "loc": [-85.629998, 41.944078]
+      "loc": [-85.629977, 41.943907]
     },
     "n2885": {
       "id": "n2885",
-      "loc": [-85.629972, 41.943927]
+      "loc": [-85.629947, 41.943775]
     },
     "n2886": {
       "id": "n2886",
-      "loc": [-85.629948, 41.943783]
+      "loc": [-85.629899, 41.943625]
     },
     "n2887": {
       "id": "n2887",
@@ -7407,16 +6617,7 @@
     },
     "n2890": {
       "id": "n2890",
-      "loc": [-85.631578, 41.944396]
-    },
-    "n2891": {
-      "id": "n2891",
-      "loc": [-85.628056, 41.944722],
-      "tags": {
-        "amenity": "place_of_worship",
-        "name": "Riverside Church",
-        "religion": "christian"
-      }
+      "loc": [-85.631571, 41.9444]
     },
     "n2892": {
       "id": "n2892",
@@ -7632,15 +6833,15 @@
     },
     "n2945": {
       "id": "n2945",
-      "loc": [-85.629692, 41.943136]
+      "loc": [-85.62959, 41.942936]
     },
     "n2946": {
       "id": "n2946",
-      "loc": [-85.629565, 41.942916]
+      "loc": [-85.629551, 41.94284]
     },
     "n2947": {
       "id": "n2947",
-      "loc": [-85.629501, 41.942751]
+      "loc": [-85.629501, 41.942704]
     },
     "n2948": {
       "id": "n2948",
@@ -7648,40 +6849,32 @@
     },
     "n2949": {
       "id": "n2949",
-      "loc": [-85.629444, 41.942414]
+      "loc": [-85.629361, 41.941801]
     },
     "n2950": {
       "id": "n2950",
-      "loc": [-85.629391, 41.94205]
+      "loc": [-85.629339, 41.941716]
     },
     "n2951": {
       "id": "n2951",
-      "loc": [-85.629369, 41.941858]
+      "loc": [-85.629315, 41.94166]
     },
     "n2952": {
       "id": "n2952",
-      "loc": [-85.629297, 41.941604]
+      "loc": [-85.629279, 41.941602]
     },
     "n2953": {
       "id": "n2953",
-      "loc": [-85.629233, 41.941549]
-    },
-    "n2954": {
-      "id": "n2954",
-      "loc": [-85.628504, 41.941364]
+      "loc": [-85.629227, 41.941556]
     },
     "n2955": {
       "id": "n2955",
-      "loc": [-85.628275, 41.941303]
+      "loc": [-85.629153, 41.941524]
     },
     "n2956": {
       "id": "n2956",
       "loc": [-85.626904, 41.941098]
     },
-    "n2957": {
-      "id": "n2957",
-      "loc": [-85.626843, 41.947333]
-    },
     "n2958": {
       "id": "n2958",
       "loc": [-85.631844, 41.942945]
@@ -7819,14 +7012,14 @@
         "highway": "residential",
         "name": "Garden Street"
       },
-      "nodes": ["n2864", "n2892", "n2893", "n2877", "n2860"]
+      "nodes": ["n2864", "n2892", "n2893", "n2877", "n2860", "n3840"]
     },
     "w529": {
       "id": "w529",
       "tags": {
         "bridge": "yes",
         "highway": "secondary",
-        "name": "East Michigan Avenue",
+        "name": "Michigan Avenue",
         "name_1": "State Highway 60",
         "ref": "M 60"
       },
@@ -7866,9 +7059,7 @@
       "tags": {
         "bridge": "yes",
         "highway": "secondary",
-        "name": "South Main Street",
-        "old_ref": "US 131",
-        "ref": "M 86"
+        "name": "Main Street"
       },
       "nodes": ["n2958", "n2896"]
     },
@@ -7876,9 +7067,7 @@
       "id": "w532",
       "tags": {
         "highway": "secondary",
-        "name": "South Main Street",
-        "old_ref": "US 131",
-        "ref": "M 86"
+        "name": "Main Street"
       },
       "nodes": ["n2896", "n394", "n364", "n2748"]
     },
@@ -7890,14 +7079,6 @@
       },
       "nodes": ["n2800", "n2943", "n2940", "n2941", "n2942", "n2943"]
     },
-    "w534": {
-      "id": "w534",
-      "tags": {
-        "highway": "residential",
-        "name": "John Glenn Court"
-      },
-      "nodes": ["n2860", "n2957"]
-    },
     "w535": {
       "id": "w535",
       "tags": {
@@ -7910,7 +7091,7 @@
       "id": "w536",
       "tags": {
         "highway": "secondary",
-        "name": "East Michigan Avenue",
+        "name": "Michigan Avenue",
         "name_1": "State Highway 60",
         "ref": "M 60"
       },
@@ -7932,6 +7113,7 @@
       },
       "nodes": [
         "n2855",
+        "n3756",
         "n2884",
         "n2885",
         "n2886",
@@ -7944,7 +7126,6 @@
         "n2951",
         "n2952",
         "n2953",
-        "n2954",
         "n2955",
         "n2848",
         "n2956",
@@ -8017,134 +7198,6 @@
         "n2233"
       ]
     },
-    "r4": {
-      "id": "r4",
-      "tags": {
-        "network": "US:MI",
-        "ref": "86",
-        "route": "road",
-        "state_id": "MI",
-        "type": "route",
-        "url": "http://en.wikipedia.org/wiki/M-86_%28Michigan_highway%29"
-      },
-      "members": [
-        {
-          "id": "w17737723",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17735949",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17740404",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17966273",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17964745",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w151538068",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w151538067",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17964960",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17966099",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17968009",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w41259499",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w151540401",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w151540418",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17967997",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17966029",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17964801",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w41259496",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w151540399",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17968004",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w227",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w531",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w532",
-          "type": "way",
-          "role": ""
-        },
-        {
-          "id": "w17732295",
-          "type": "way",
-          "role": ""
-        }
-      ]
-    },
     "n2989": {
       "id": "n2989",
       "loc": [-85.627141, 41.940727]
@@ -8891,48 +7944,6 @@
       "id": "n3162",
       "loc": [-85.631648, 41.940043]
     },
-    "n3163": {
-      "id": "n3163",
-      "loc": [-85.627051, 41.931712],
-      "tags": {
-        "railway": "level_crossing"
-      }
-    },
-    "n3164": {
-      "id": "n3164",
-      "loc": [-85.627818, 41.934212],
-      "tags": {
-        "railway": "level_crossing"
-      }
-    },
-    "n3165": {
-      "id": "n3165",
-      "loc": [-85.627499, 41.933182],
-      "tags": {
-        "railway": "level_crossing"
-      }
-    },
-    "n3166": {
-      "id": "n3166",
-      "loc": [-85.629711, 41.935394],
-      "tags": {
-        "railway": "level_crossing"
-      }
-    },
-    "n3167": {
-      "id": "n3167",
-      "loc": [-85.62811, 41.935198],
-      "tags": {
-        "railway": "level_crossing"
-      }
-    },
-    "n3168": {
-      "id": "n3168",
-      "loc": [-85.626888, 41.931176],
-      "tags": {
-        "railway": "level_crossing"
-      }
-    },
     "n3169": {
       "id": "n3169",
       "loc": [-85.633628, 41.935437]
@@ -9316,23 +8327,23 @@
     },
     "n3192": {
       "id": "n3192",
-      "loc": [-85.628469, 41.948674]
+      "loc": [-85.628591, 41.948536]
     },
     "n3193": {
       "id": "n3193",
-      "loc": [-85.63205, 41.951174]
+      "loc": [-85.63205, 41.951181]
     },
     "n3194": {
       "id": "n3194",
-      "loc": [-85.632034, 41.949905]
+      "loc": [-85.632034, 41.949909]
     },
     "n3195": {
       "id": "n3195",
-      "loc": [-85.630841, 41.951197]
+      "loc": [-85.630841, 41.951191]
     },
     "n3196": {
       "id": "n3196",
-      "loc": [-85.632083, 41.953707]
+      "loc": [-85.632083, 41.9537]
     },
     "n3197": {
       "id": "n3197",
@@ -9352,7 +8363,7 @@
     },
     "n3201": {
       "id": "n3201",
-      "loc": [-85.632072, 41.95244]
+      "loc": [-85.632072, 41.952447]
     },
     "n3202": {
       "id": "n3202",
@@ -9360,15 +8371,15 @@
     },
     "n3203": {
       "id": "n3203",
-      "loc": [-85.632111, 41.955916]
+      "loc": [-85.632111, 41.955911]
     },
     "n3204": {
       "id": "n3204",
-      "loc": [-85.630855, 41.952452]
+      "loc": [-85.630855, 41.952457]
     },
     "n3205": {
       "id": "n3205",
-      "loc": [-85.630869, 41.953713]
+      "loc": [-85.630869, 41.953709]
     },
     "n3206": {
       "id": "n3206",
@@ -9380,35 +8391,29 @@
     },
     "n3208": {
       "id": "n3208",
-      "loc": [-85.633214, 41.948618]
+      "loc": [-85.633214, 41.948619]
     },
     "n3209": {
       "id": "n3209",
-      "loc": [-85.633274, 41.951159]
+      "loc": [-85.633253, 41.951171]
     },
     "n3210": {
       "id": "n3210",
-      "loc": [-85.633258, 41.949891]
+      "loc": [-85.633234, 41.949901]
     },
     "n3211": {
       "id": "n3211",
-      "loc": [-85.633922, 41.948622]
+      "loc": [-85.633922, 41.948616]
     },
     "w577": {
       "id": "w577",
       "tags": {
-        "highway": "residential",
+        "highway": "service",
+        "service": "driveway",
+        "surface": "unpaved",
         "name": "Willow Drive"
       },
-      "nodes": ["n2944", "n3192"]
-    },
-    "w578": {
-      "id": "w578",
-      "tags": {
-        "highway": "residential",
-        "name": "East Armitage Street"
-      },
-      "nodes": ["n2769", "n3195", "n3193", "n3209", "n2758"]
+      "nodes": ["n2944", "n3192", "n3757", "n3813", "n3814", "n3815", "n3816", "n3817", "n3818", "n3819"]
     },
     "w579": {
       "id": "w579",
@@ -9418,21 +8423,13 @@
       },
       "nodes": ["n2754", "n3195", "n3204", "n3205", "n3206", "n3207", "n3199", "n3197", "n1032"]
     },
-    "w580": {
-      "id": "w580",
-      "tags": {
-        "highway": "residential",
-        "name": "East Bennett Street"
-      },
-      "nodes": ["n2768", "n3194", "n3210", "n2760"]
-    },
     "w581": {
       "id": "w581",
       "tags": {
         "highway": "residential",
-        "name": "East Kelsey Street"
+        "name": "Kelsey Street"
       },
-      "nodes": ["n2765", "n3208", "n3211", "n2755"]
+      "nodes": ["n2765", "n3208", "n3211", "n2755", "n3280", "n2756", "n3346"]
     },
     "w582": {
       "id": "w582",
@@ -9835,13 +8832,13 @@
       "id": "w596",
       "tags": {
         "highway": "residential",
-        "name": "West Armitage Street"
+        "name": "Armitage Street"
       },
-      "nodes": ["n2758", "n2759", "n3279"]
+      "nodes": ["n2769", "n3195", "n3193", "n3209", "n2758", "n2759", "n3279"]
     },
     "n3280": {
       "id": "n3280",
-      "loc": [-85.635429, 41.94862]
+      "loc": [-85.635429, 41.948608]
     },
     "n3281": {
       "id": "n3281",
@@ -10101,7 +9098,7 @@
     },
     "n3345": {
       "id": "n3345",
-      "loc": [-85.637396, 41.948994]
+      "loc": [-85.637386, 41.94906]
     },
     "n3346": {
       "id": "n3346",
@@ -10133,7 +9130,7 @@
     },
     "n3353": {
       "id": "n3353",
-      "loc": [-85.635459, 41.949874]
+      "loc": [-85.635459, 41.949886]
     },
     "n3354": {
       "id": "n3354",
@@ -10253,7 +9250,7 @@
     },
     "n3383": {
       "id": "n3383",
-      "loc": [-85.633921, 41.947334]
+      "loc": [-85.633921, 41.947333]
     },
     "n3384": {
       "id": "n3384",
@@ -10295,15 +9292,6 @@
       "id": "n3393",
       "loc": [-85.634093, 41.948506]
     },
-    "n3394": {
-      "id": "n3394",
-      "loc": [-85.634167, 41.947778],
-      "tags": {
-        "amenity": "place_of_worship",
-        "name": "Faith Tabernacle Church",
-        "religion": "christian"
-      }
-    },
     "n3395": {
       "id": "n3395",
       "loc": [-85.63378, 41.95099]
@@ -10360,18 +9348,9 @@
       "id": "n3408",
       "loc": [-85.633356, 41.949982]
     },
-    "n3409": {
-      "id": "n3409",
-      "loc": [-85.634167, 41.949722],
-      "tags": {
-        "amenity": "place_of_worship",
-        "name": "Trinity Episcopal Church",
-        "religion": "christian"
-      }
-    },
     "n3410": {
       "id": "n3410",
-      "loc": [-85.633307, 41.9537]
+      "loc": [-85.633292, 41.953691]
     },
     "n3411": {
       "id": "n3411",
@@ -10379,19 +9358,19 @@
     },
     "n3412": {
       "id": "n3412",
-      "loc": [-85.633361, 41.957422]
+      "loc": [-85.633349, 41.957422]
     },
     "n3413": {
       "id": "n3413",
-      "loc": [-85.63334, 41.955918]
+      "loc": [-85.633326, 41.955909]
     },
     "n3414": {
       "id": "n3414",
-      "loc": [-85.633311, 41.954673]
+      "loc": [-85.633307, 41.954673]
     },
     "n3415": {
       "id": "n3415",
-      "loc": [-85.633292, 41.952426]
+      "loc": [-85.633273, 41.952436]
     },
     "n3416": {
       "id": "n3416",
@@ -10400,29 +9379,17 @@
         "highway": "turning_circle"
       }
     },
-    "w597": {
-      "id": "w597",
-      "tags": {
-        "highway": "residential",
-        "name": "West Prutzman Street"
-      },
-      "nodes": ["n2749", "n2798", "n2750"]
-    },
     "w598": {
       "id": "w598",
       "tags": {
-        "building": "yes"
+        "building": "school"
       },
       "nodes": ["n3404", "n3403", "n3402", "n3401", "n3400", "n3399", "n3398", "n3397", "n3373", "n3372", "n3396", "n3395", "n3404"]
     },
     "w599": {
       "id": "w599",
       "tags": {
-        "amenity": "place_of_worship",
-        "building": "yes",
-        "denomination": "presbyterian",
-        "name": "First Presbyterian Church",
-        "religion": "christian"
+        "building": "yes"
       },
       "nodes": [
         "n3371",
@@ -10502,7 +9469,7 @@
         "highway": "service",
         "service": "alley"
       },
-      "nodes": ["n3211", "n3383"]
+      "nodes": ["n3753", "n3211", "n3383"]
     },
     "w605": {
       "id": "w605",
@@ -10511,22 +9478,6 @@
       },
       "nodes": ["n3290", "n3289", "n3288", "n3287", "n3286", "n3285", "n3284", "n3283", "n3282", "n3281", "n3290"]
     },
-    "w606": {
-      "id": "w606",
-      "tags": {
-        "highway": "residential",
-        "name": "Maple Street"
-      },
-      "nodes": ["n3346", "n3345", "n3378", "n3279", "n3411"]
-    },
-    "w607": {
-      "id": "w607",
-      "tags": {
-        "highway": "residential",
-        "name": "West Kelsey Street"
-      },
-      "nodes": ["n2755", "n3280", "n2756", "n3346"]
-    },
     "w608": {
       "id": "w608",
       "tags": {
@@ -10539,9 +9490,9 @@
       "id": "w609",
       "tags": {
         "highway": "residential",
-        "name": "Rock River Avenue"
+        "name": "Maple Street"
       },
-      "nodes": ["n2772", "n3346"]
+      "nodes": ["n2772", "n3346", "n3746", "n3748", "n3747", "n3345", "n3378", "n3279", "n3411"]
     },
     "w610": {
       "id": "w610",
@@ -10555,17 +9506,17 @@
       "id": "w611",
       "tags": {
         "highway": "residential",
-        "name": "West Bennett Street"
+        "name": "Bennett Street"
       },
-      "nodes": ["n2760", "n3353", "n2773", "n3378"]
+      "nodes": ["n2768", "n3194", "n3210", "n3753", "n2760", "n3353", "n2773", "n3378"]
     },
     "w612": {
       "id": "w612",
       "tags": {
         "highway": "residential",
-        "name": "East Prutzman Street"
+        "name": "Market Street"
       },
-      "nodes": ["n2751", "n3383", "n2749"]
+      "nodes": ["n2751", "n3383", "n2749", "n2798", "n2772"]
     },
     "w613": {
       "id": "w613",
@@ -10584,11 +9535,7 @@
     "w615": {
       "id": "w615",
       "tags": {
-        "amenity": "place_of_worship",
-        "building": "church",
-        "denomination": "methodist",
-        "name": "First United Methodist Church",
-        "religion": "christian"
+        "building": "yes"
       },
       "nodes": [
         "n3393",
@@ -10614,7 +9561,7 @@
       "id": "w616",
       "tags": {
         "amenity": "school",
-        "name": "Hoppin School"
+        "name": "Three Rivers Elementary School"
       },
       "nodes": ["n3376", "n3407", "n3408", "n3377", "n3376"]
     },
@@ -10636,23 +9583,6 @@
       "id": "n3417",
       "loc": [-85.619899, 41.945527]
     },
-    "n3418": {
-      "id": "n3418",
-      "loc": [-85.621944, 41.945556],
-      "tags": {
-        "amenity": "place_of_worship",
-        "name": "Grant Chapel",
-        "religion": "christian"
-      }
-    },
-    "n3419": {
-      "id": "n3419",
-      "loc": [-85.620278, 41.946111],
-      "tags": {
-        "building": "yes",
-        "name": "George Washington Carver Community Center"
-      }
-    },
     "n3420": {
       "id": "n3420",
       "loc": [-85.620088, 41.945571]
@@ -10981,7 +9911,7 @@
       "id": "w619",
       "tags": {
         "highway": "secondary",
-        "name": "East Michigan Avenue",
+        "name": "Michigan Avenue",
         "ref": "M 60"
       },
       "nodes": ["n2863", "n3424", "n3425", "n3426", "n3427", "n3428", "n3429", "n3430", "n3431", "n3432", "n3433", "n2844"]
@@ -11099,7 +10029,7 @@
       "id": "w626",
       "tags": {
         "highway": "unclassified",
-        "name": "East Michigan Avenue",
+        "name": "Michigan Avenue",
         "name_1": "State Highway 60"
       },
       "nodes": ["n3439", "n3423", "n2863"]
@@ -11132,51 +10062,27 @@
     },
     "n3503": {
       "id": "n3503",
-      "loc": [-85.62965, 41.954687]
+      "loc": [-85.629677, 41.954687]
     },
     "n3504": {
       "id": "n3504",
-      "loc": [-85.629083, 41.953723]
-    },
-    "n3505": {
-      "id": "n3505",
-      "loc": [-85.629768, 41.952469]
-    },
-    "n3506": {
-      "id": "n3506",
-      "loc": [-85.629652, 41.952563]
+      "loc": [-85.629083, 41.953722]
     },
     "n3507": {
       "id": "n3507",
-      "loc": [-85.629676, 41.95372]
+      "loc": [-85.629665, 41.953718]
     },
     "n3508": {
       "id": "n3508",
       "loc": [-85.624454, 41.954707]
     },
-    "w629": {
-      "id": "w629",
-      "tags": {
-        "highway": "residential",
-        "name": "East Wheeler Street"
-      },
-      "nodes": ["n2745", "n3505", "n3204", "n3201", "n3415", "n2761"]
-    },
     "w630": {
       "id": "w630",
       "tags": {
         "highway": "residential",
-        "name": "East Hoffman Street"
+        "name": "Hoffman Street"
       },
-      "nodes": ["n2757", "n3414", "n3202", "n3206", "n3503", "n1629", "n2763", "n2764", "n3508"]
-    },
-    "w631": {
-      "id": "w631",
-      "tags": {
-        "highway": "residential",
-        "name": "East Cushman Street"
-      },
-      "nodes": ["n2766", "n3504", "n3507", "n3205", "n3196"]
+      "nodes": ["n2757", "n3414", "n3202", "n3206", "n3750", "n3503", "n1629", "n2763", "n2764", "n3508"]
     },
     "w632": {
       "id": "w632",
@@ -11184,7 +10090,7 @@
         "highway": "residential",
         "name": "Cushman Street"
       },
-      "nodes": ["n3196", "n3410", "n2746"]
+      "nodes": ["n2766", "n3504", "n3507", "n3751", "n3205", "n3196", "n3410", "n2746"]
     },
     "w633": {
       "id": "w633",
@@ -11192,7 +10098,7 @@
         "highway": "residential",
         "name": "Pine Street"
       },
-      "nodes": ["n2745", "n3506", "n3507", "n3503"]
+      "nodes": ["n2745", "n3749", "n3507", "n3503"]
     },
     "n3509": {
       "id": "n3509",
@@ -11237,11 +10143,7 @@
     "w635": {
       "id": "w635",
       "tags": {
-        "amenity": "place_of_worship",
-        "building": "yes",
-        "denomination": "baptist",
-        "name": "Calvary Missionary Baptist Church",
-        "religion": "christian"
+        "building": "yes"
       },
       "nodes": ["n3513", "n3514", "n3515", "n3516", "n3513"]
     },
@@ -11249,9 +10151,9 @@
       "id": "w636",
       "tags": {
         "highway": "residential",
-        "name": "West Wheeler Street"
+        "name": "Wheeler Street"
       },
-      "nodes": ["n2761", "n2767", "n3411"]
+      "nodes": ["n2745", "n3752", "n3204", "n3201", "n3415", "n2761", "n2767", "n3411"]
     },
     "n3517": {
       "id": "n3517",
@@ -12006,7 +10908,7 @@
       "tags": {
         "bridge": "yes",
         "highway": "residential",
-        "name": "East Hoffman Street"
+        "name": "Hoffman Street"
       },
       "nodes": ["n3508", "n3518"]
     },
@@ -12014,7 +10916,7 @@
       "id": "w639",
       "tags": {
         "highway": "residential",
-        "name": "East Hoffman Street"
+        "name": "Hoffman Street"
       },
       "nodes": ["n3518", "n1204", "n2862", "n3519", "n3520", "n3521", "n3522", "n3523", "n3524", "n3549", "n3552", "n3551", "n3473"]
     },
@@ -12444,125 +11346,9 @@
         "place": "city",
         "type": "boundary"
       },
-      "members": [
-        {
-          "id": "w642",
-          "type": "way",
-          "role": "outer"
-        },
-        {
-          "id": "w34369821",
-          "type": "way",
-          "role": "outer"
-        },
-        {
-          "id": "w34369822",
-          "type": "way",
-          "role": "outer"
-        },
-        {
-          "id": "w34369823",
-          "type": "way",
-          "role": "outer"
-        },
-        {
-          "id": "w34369824",
-          "type": "way",
-          "role": "outer"
-        },
-        {
-          "id": "w34369810",
-          "type": "way",
-          "role": "inner"
-        },
-        {
-          "id": "w34369815",
-          "type": "way",
-          "role": "inner"
-        },
-        {
-          "id": "w34369820",
-          "type": "way",
-          "role": "inner"
-        }
-      ]
-    },
-    "n3744": {
-      "id": "n3744",
-      "loc": [-85.640077, 41.956776]
-    },
-    "n3745": {
-      "id": "n3745",
-      "loc": [-85.639902, 41.956715]
-    },
-    "n3746": {
-      "id": "n3746",
-      "loc": [-85.640004, 41.956553]
-    },
-    "n3747": {
-      "id": "n3747",
-      "loc": [-85.640179, 41.956614]
-    },
-    "n3748": {
-      "id": "n3748",
-      "loc": [-85.639769, 41.957235]
-    },
-    "n3749": {
-      "id": "n3749",
-      "loc": [-85.639923, 41.956983]
-    },
-    "n3750": {
-      "id": "n3750",
-      "loc": [-85.639706, 41.95691]
-    },
-    "n3751": {
-      "id": "n3751",
-      "loc": [-85.639552, 41.957162]
-    },
-    "n3752": {
-      "id": "n3752",
-      "loc": [-85.639103, 41.956952]
-    },
-    "n3753": {
-      "id": "n3753",
-      "loc": [-85.639288, 41.956646]
-    },
-    "n3754": {
-      "id": "n3754",
-      "loc": [-85.639484, 41.956712]
-    },
-    "n3755": {
-      "id": "n3755",
-      "loc": [-85.639432, 41.956797]
-    },
-    "n3756": {
-      "id": "n3756",
-      "loc": [-85.639372, 41.956777]
-    },
-    "n3757": {
-      "id": "n3757",
-      "loc": [-85.639239, 41.956997]
-    },
-    "w643": {
-      "id": "w643",
-      "tags": {
-        "building": "yes"
-      },
-      "nodes": ["n3748", "n3749", "n3750", "n3751", "n3748"]
-    },
-    "w644": {
-      "id": "w644",
-      "tags": {
-        "building": "yes"
-      },
-      "nodes": ["n3744", "n3745", "n3746", "n3747", "n3744"]
-    },
-    "w645": {
-      "id": "w645",
-      "tags": {
-        "building": "yes"
-      },
-      "nodes": ["n3752", "n3753", "n3754", "n3755", "n3756", "n3757", "n3752"]
+      "members": [{
+          "id": "w642", "type": "way", "role": "outer"
+        }]
     },
     "n3758": {
       "id": "n3758",
@@ -12572,78 +11358,6 @@
       "id": "n3759",
       "loc": [-85.627019, 41.957369]
     },
-    "n3760": {
-      "id": "n3760",
-      "loc": [-85.62529, 41.958568]
-    },
-    "n3761": {
-      "id": "n3761",
-      "loc": [-85.624962, 41.958453]
-    },
-    "n3762": {
-      "id": "n3762",
-      "loc": [-85.624832, 41.958399]
-    },
-    "n3763": {
-      "id": "n3763",
-      "loc": [-85.624707, 41.958325]
-    },
-    "n3764": {
-      "id": "n3764",
-      "loc": [-85.624636, 41.958251]
-    },
-    "n3765": {
-      "id": "n3765",
-      "loc": [-85.624578, 41.95818]
-    },
-    "n3766": {
-      "id": "n3766",
-      "loc": [-85.624533, 41.958099]
-    },
-    "n3767": {
-      "id": "n3767",
-      "loc": [-85.624507, 41.957985]
-    },
-    "n3768": {
-      "id": "n3768",
-      "loc": [-85.624495, 41.957807]
-    },
-    "n3769": {
-      "id": "n3769",
-      "loc": [-85.624514, 41.957663]
-    },
-    "n3770": {
-      "id": "n3770",
-      "loc": [-85.624577, 41.957593]
-    },
-    "n3771": {
-      "id": "n3771",
-      "loc": [-85.624685, 41.95754]
-    },
-    "n3772": {
-      "id": "n3772",
-      "loc": [-85.624802, 41.957523]
-    },
-    "n3773": {
-      "id": "n3773",
-      "loc": [-85.624996, 41.957524]
-    },
-    "n3774": {
-      "id": "n3774",
-      "loc": [-85.625409, 41.957515]
-    },
-    "n3775": {
-      "id": "n3775",
-      "loc": [-85.625634, 41.957496]
-    },
-    "n3776": {
-      "id": "n3776",
-      "loc": [-85.625832, 41.957453]
-    },
-    "n3777": {
-      "id": "n3777",
-      "loc": [-85.626044, 41.957394]
-    },
     "n3778": {
       "id": "n3778",
       "loc": [-85.626158, 41.958996]
@@ -12668,46 +11382,13 @@
       "id": "n3783",
       "loc": [-85.626048, 41.958965]
     },
-    "n3784": {
-      "id": "n3784",
-      "loc": [-85.628404, 41.957438]
-    },
     "w646": {
       "id": "w646",
       "tags": {
         "highway": "residential",
         "name": "Flower Street"
       },
-      "nodes": ["n2752", "n3759", "n1420", "n1421", "n1422", "n3758", "n3784", "n3199", "n3200", "n3412"]
-    },
-    "w647": {
-      "id": "w647",
-      "tags": {
-        "highway": "residential",
-        "name": "Azaleamum Drive"
-      },
-      "nodes": [
-        "n2771",
-        "n3760",
-        "n3761",
-        "n3762",
-        "n3763",
-        "n3764",
-        "n3765",
-        "n3766",
-        "n3767",
-        "n3768",
-        "n3769",
-        "n3770",
-        "n3771",
-        "n3772",
-        "n3773",
-        "n3774",
-        "n3775",
-        "n3776",
-        "n3777",
-        "n2770"
-      ]
+      "nodes": ["n2752", "n3759", "n1420", "n1421", "n1422", "n3758", "n3199", "n3200", "n3412"]
     },
     "w648": {
       "id": "w648",
@@ -12729,7 +11410,7 @@
       "id": "w650",
       "tags": {
         "highway": "residential",
-        "name": "East Adams Street"
+        "name": "Adams Street"
       },
       "nodes": ["n3207", "n3203", "n3413", "n2762"]
     },
@@ -12924,189 +11605,6 @@
       },
       "nodes": ["n3798", "n3806", "n3807", "n3808"]
     },
-    "n3813": {
-      "id": "n3813",
-      "loc": [-85.618483, 41.960025]
-    },
-    "n3814": {
-      "id": "n3814",
-      "loc": [-85.616863, 41.960583]
-    },
-    "n3815": {
-      "id": "n3815",
-      "loc": [-85.619738, 41.961716]
-    },
-    "n3816": {
-      "id": "n3816",
-      "loc": [-85.619888, 41.962083]
-    },
-    "n3817": {
-      "id": "n3817",
-      "loc": [-85.619695, 41.96194]
-    },
-    "n3818": {
-      "id": "n3818",
-      "loc": [-85.61903, 41.96095]
-    },
-    "n3819": {
-      "id": "n3819",
-      "loc": [-85.618047, 41.960979]
-    },
-    "n3820": {
-      "id": "n3820",
-      "loc": [-85.620382, 41.960544]
-    },
-    "n3821": {
-      "id": "n3821",
-      "loc": [-85.620156, 41.960328]
-    },
-    "n3822": {
-      "id": "n3822",
-      "loc": [-85.617045, 41.959889]
-    },
-    "n3823": {
-      "id": "n3823",
-      "loc": [-85.617764, 41.959849]
-    },
-    "n3824": {
-      "id": "n3824",
-      "loc": [-85.619523, 41.961014]
-    },
-    "n3825": {
-      "id": "n3825",
-      "loc": [-85.618118, 41.962793]
-    },
-    "n3826": {
-      "id": "n3826",
-      "loc": [-85.617463, 41.962897]
-    },
-    "n3827": {
-      "id": "n3827",
-      "loc": [-85.617034, 41.963088]
-    },
-    "n3828": {
-      "id": "n3828",
-      "loc": [-85.61947, 41.960192]
-    },
-    "n3829": {
-      "id": "n3829",
-      "loc": [-85.620772, 41.961067]
-    },
-    "n3830": {
-      "id": "n3830",
-      "loc": [-85.620232, 41.962211]
-    },
-    "n3831": {
-      "id": "n3831",
-      "loc": [-85.61845, 41.962466]
-    },
-    "n3832": {
-      "id": "n3832",
-      "loc": [-85.617893, 41.962849]
-    },
-    "n3833": {
-      "id": "n3833",
-      "loc": [-85.617335, 41.959802]
-    },
-    "n3834": {
-      "id": "n3834",
-      "loc": [-85.618622, 41.96091]
-    },
-    "n3835": {
-      "id": "n3835",
-      "loc": [-85.617592, 41.960831]
-    },
-    "n3836": {
-      "id": "n3836",
-      "loc": [-85.616777, 41.96332]
-    },
-    "n3837": {
-      "id": "n3837",
-      "loc": [-85.619856, 41.961461]
-    },
-    "n3838": {
-      "id": "n3838",
-      "loc": [-85.620822, 41.962019]
-    },
-    "n3839": {
-      "id": "n3839",
-      "loc": [-85.618311, 41.961254]
-    },
-    "n3840": {
-      "id": "n3840",
-      "loc": [-85.618365, 41.962642]
-    },
-    "n3841": {
-      "id": "n3841",
-      "loc": [-85.6205, 41.960855]
-    },
-    "n3842": {
-      "id": "n3842",
-      "loc": [-85.618493, 41.962139]
-    },
-    "n3843": {
-      "id": "n3843",
-      "loc": [-85.620693, 41.962115]
-    },
-    "n3844": {
-      "id": "n3844",
-      "loc": [-85.617088, 41.960735]
-    },
-    "n3845": {
-      "id": "n3845",
-      "loc": [-85.61683, 41.960121]
-    },
-    "n3846": {
-      "id": "n3846",
-      "loc": [-85.619813, 41.96123]
-    },
-    "n3847": {
-      "id": "n3847",
-      "loc": [-85.616798, 41.960376]
-    },
-    "n3848": {
-      "id": "n3848",
-      "loc": [-85.620586, 41.961046]
-    },
-    "n3849": {
-      "id": "n3849",
-      "loc": [-85.618054, 41.965554]
-    },
-    "n3850": {
-      "id": "n3850",
-      "loc": [-85.618107, 41.965921]
-    },
-    "n3851": {
-      "id": "n3851",
-      "loc": [-85.616895, 41.964453]
-    },
-    "n3852": {
-      "id": "n3852",
-      "loc": [-85.617292, 41.96462]
-    },
-    "n3853": {
-      "id": "n3853",
-      "loc": [-85.617807, 41.965043]
-    },
-    "n3854": {
-      "id": "n3854",
-      "loc": [-85.616691, 41.964269]
-    },
-    "n3855": {
-      "id": "n3855",
-      "loc": [-85.616541, 41.963687]
-    },
-    "n3856": {
-      "id": "n3856",
-      "loc": [-85.616519, 41.963942]
-    },
-    "w658": {
-      "id": "w658",
-      "tags": {
-        "waterway": "river"
-      },
-      "nodes": ["n3819", "n3834", "n3818", "n3824", "n3846", "n3837", "n3815", "n3817", "n3816", "n3830", "n3843", "n3838", "n3609"]
-    },
     "n3857": {
       "id": "n3857",
       "loc": [-85.618937, 41.951943]
@@ -13117,11 +11615,11 @@
     },
     "n3859": {
       "id": "n3859",
-      "loc": [-85.616773, 41.954737]
+      "loc": [-85.616854, 41.954737]
     },
     "n3860": {
       "id": "n3860",
-      "loc": [-85.616699, 41.954742]
+      "loc": [-85.616485, 41.95474]
     },
     "n3861": {
       "id": "n3861",
@@ -13579,14 +12077,6 @@
       "id": "n3974",
       "loc": [-85.61981, 41.951041]
     },
-    "n3975": {
-      "id": "n3975",
-      "loc": [-85.611651, 41.954761]
-    },
-    "n3976": {
-      "id": "n3976",
-      "loc": [-85.614195, 41.954754]
-    },
     "n3977": {
       "id": "n3977",
       "loc": [-85.617375, 41.947559]
@@ -13595,10 +12085,6 @@
       "id": "n3978",
       "loc": [-85.617416, 41.95108]
     },
-    "n3979": {
-      "id": "n3979",
-      "loc": [-85.613542, 41.954756]
-    },
     "n3980": {
       "id": "n3980",
       "loc": [-85.610238, 41.954774]
@@ -13782,9 +12268,7 @@
     "w668": {
       "id": "w668",
       "tags": {
-        "amenity": "school",
-        "building": "yes",
-        "name": "Three Rivers Middle School"
+        "building": "school"
       },
       "nodes": [
         "n3900",
@@ -13836,10 +12320,10 @@
       "id": "w670",
       "tags": {
         "highway": "secondary",
-        "name": "East Hoffman Street",
+        "name": "Hoffman Street",
         "ref": "M 60"
       },
-      "nodes": ["n3473", "n3859", "n3860", "n3976", "n3979", "n3975", "n3980"]
+      "nodes": ["n3473", "n3859", "n3860", "n3980"]
     },
     "w671": {
       "id": "w671",
@@ -13984,126 +12468,10 @@
       "tags": {
         "access": "private",
         "highway": "service",
-        "name": "Manistee River Road"
+        "name": "River Road"
       },
       "nodes": ["n3808", "n4008", "n3805", "n3809", "n3804", "n4009", "n4010"]
     },
-    "w1": {
-      "tags": {
-        "name": "Rocky River",
-        "waterway": "river"
-      },
-      "id": "w1",
-      "nodes": [
-        "n2187",
-        "n2209",
-        "n2215",
-        "n2184",
-        "n2212",
-        "n2190",
-        "n2202",
-        "n2206",
-        "n2175",
-        "n2167",
-        "n2203",
-        "n2214",
-        "n2173",
-        "n2163",
-        "n2176",
-        "n2208",
-        "n2185",
-        "n2207",
-        "n2161",
-        "n2160",
-        "n2195",
-        "n2174",
-        "n2182",
-        "n2191",
-        "n2194",
-        "n2193",
-        "n2165",
-        "n2172",
-        "n2201",
-        "n2197",
-        "n2178",
-        "n39",
-        "n2199",
-        "n40",
-        "n2181",
-        "n2198",
-        "n2168",
-        "n2192",
-        "n2166",
-        "n2213",
-        "n2171",
-        "n2183",
-        "n2180",
-        "n2205",
-        "n2177",
-        "n2179",
-        "n2218",
-        "n2200",
-        "n2188",
-        "n2169",
-        "n2196",
-        "n2162",
-        "n2170",
-        "n2211",
-        "n2216",
-        "n2204",
-        "n2220",
-        "n2164",
-        "n2210",
-        "n2217",
-        "n2189",
-        "n460",
-        "n453",
-        "n2282"
-      ]
-    },
-    "w2": {
-      "tags": {
-        "name": "Portage River",
-        "waterway": "river"
-      },
-      "id": "w2",
-      "nodes": [
-        "n3850",
-        "n3849",
-        "n3853",
-        "n3852",
-        "n3851",
-        "n3854",
-        "n3856",
-        "n3855",
-        "n3836",
-        "n3827",
-        "n3826",
-        "n3832",
-        "n3825",
-        "n3840",
-        "n3831",
-        "n3842",
-        "n3839",
-        "n3819",
-        "n3835",
-        "n3844",
-        "n3814",
-        "n3847",
-        "n3845",
-        "n3822",
-        "n3833",
-        "n3823",
-        "n3813",
-        "n3828",
-        "n3821",
-        "n3820",
-        "n3841",
-        "n3848",
-        "n3829",
-        "n3695"
-      ]
-    },
     "n4": {
       "id": "n4",
       "loc": [-85.62276, 41.951784]
@@ -14236,14 +12604,6 @@
       "id": "n37",
       "loc": [-85.637611, 41.945383]
     },
-    "n39": {
-      "id": "n39",
-      "loc": [-85.638967, 41.948541]
-    },
-    "n40": {
-      "id": "n40",
-      "loc": [-85.638786, 41.948323]
-    },
     "n41": {
       "id": "n41",
       "loc": [-85.636233, 41.942764]
@@ -19134,7 +17494,7 @@
         "cuisine": "pizza",
         "amenity": "restaurant",
         "addr:housenumber": "401",
-        "addr:street": "West Michigan Avenue",
+        "addr:street": "Michigan Avenue",
         "addr:city": "Three Rivers",
         "addr:state": "MI",
         "addr:postcode": "49093"
@@ -19235,9 +17595,9 @@
       "id": "n907",
       "tags": {
         "shop": "pawnbroker",
-        "name": "Hock It To Me",
+        "name": "Gem Pawnbroker",
         "addr:housenumber": "416",
-        "addr:street": "West Michigan Avenue",
+        "addr:street": "Michigan Avenue",
         "addr:city": "Three Rivers",
         "addr:state": "MI",
         "addr:postcode": "49093"
@@ -19256,9 +17616,9 @@
       "id": "n909",
       "tags": {
         "shop": "car_repair",
-        "name": "Brokers Service",
+        "name": "William Towing",
         "addr:housenumber": "500",
-        "addr:street": "West Michigan Avenue",
+        "addr:street": "Michigan Avenue",
         "addr:city": "Three Rivers",
         "addr:state": "MI",
         "addr:postcode": "49093",
@@ -19278,7 +17638,7 @@
         "cuisine": "coffee_shop",
         "name": "L.A.'s Coffee Cafe",
         "addr:housenumber": "145",
-        "addr:street": "West Michigan Avenue",
+        "addr:street": "Michigan Avenue",
         "addr:city": "Three Rivers",
         "addr:state": "MI",
         "addr:postcode": "49093",
@@ -19328,7 +17688,7 @@
         "office": "insurance",
         "name": "Preferred Insurance Services",
         "addr:housenumber": "132",
-        "addr:street": "West Michigan Avenue",
+        "addr:street": "Michigan Avenue",
         "addr:city": "Three Rivers",
         "addr:state": "MI",
         "addr:postcode": "49093"
@@ -19341,7 +17701,7 @@
         "shop": "car_repair",
         "name": "Lynn's Garage",
         "addr:housenumber": "101",
-        "addr:street": "South Main Street",
+        "addr:street": "Main Street",
         "addr:city": "Three Rivers",
         "addr:state": "MI",
         "addr:postcode": "49093",
@@ -19614,9 +17974,9 @@
       "id": "n957",
       "tags": {
         "office": "employment_agency",
-        "name": "Access Point",
+        "name": "Access Point Employment",
         "addr:housenumber": "5",
-        "addr:street": "North Main Street",
+        "addr:street": "Main Street",
         "addr:city": "Three Rivers",
         "addr:state": "MI",
         "addr:postcode": "49093"
@@ -19627,9 +17987,9 @@
       "id": "n958",
       "tags": {
         "shop": "second_hand",
-        "name": "The Pink Paisley Poppy Emporium",
+        "name": "Paisley Emporium",
         "addr:housenumber": "6",
-        "addr:street": "North Main Street",
+        "addr:street": "Main Street",
         "addr:city": "Three Rivers",
         "addr:state": "MI",
         "addr:postcode": "49093"
@@ -19640,9 +18000,9 @@
       "id": "n959",
       "tags": {
         "shop": "books",
-        "name": "Lowry's Books & More",
+        "name": "Lowry's Books",
         "addr:housenumber": "22",
-        "addr:street": "North Main Street",
+        "addr:street": "Main Street",
         "addr:city": "Three Rivers",
         "addr:state": "MI",
         "addr:postcode": "49093"
@@ -19656,7 +18016,7 @@
         "amenity": "restaurant",
         "cuisine": "pizza",
         "addr:housenumber": "16",
-        "addr:street": "North Main Street",
+        "addr:street": "Main Street",
         "addr:city": "Three Rivers",
         "addr:state": "MI",
         "addr:postcode": "49093"
@@ -19671,7 +18031,7 @@
         "cuisine": "american",
         "internet_access": "yes",
         "addr:housenumber": "13",
-        "addr:street": "North Main Street",
+        "addr:street": "Main Street",
         "addr:city": "Three Rivers",
         "addr:state": "MI",
         "addr:postcode": "49093"
@@ -19682,9 +18042,9 @@
       "id": "n962",
       "tags": {
         "leisure": "fitness_centre",
-        "name": "Main Street Fit-Ness",
+        "name": "Main Street Fitness",
         "addr:housenumber": "28",
-        "addr:street": "North Main Street",
+        "addr:street": "Main Street",
         "addr:city": "Three Rivers",
         "addr:state": "MI",
         "addr:postcode": "49093"
@@ -19695,9 +18055,9 @@
       "id": "n963",
       "tags": {
         "leisure": "fitness_centre",
-        "name": "Main Street Bar-Bell",
+        "name": "Main Street Barbell",
         "addr:housenumber": "27",
-        "addr:street": "North Main Street",
+        "addr:street": "Main Street",
         "addr:city": "Three Rivers",
         "addr:state": "MI",
         "addr:postcode": "49093"
@@ -19974,7 +18334,7 @@
         "shop": "paint",
         "name": "Sherwin-Williams",
         "addr:housenumber": "31",
-        "addr:street": "North Main Street",
+        "addr:street": "Main Street",
         "addr:city": "Three Rivers",
         "addr:state": "MI",
         "addr:postcode": "49093"
@@ -19985,9 +18345,9 @@
       "id": "n1011",
       "tags": {
         "shop": "jewelry",
-        "name": "UniQ Jewelry",
+        "name": "Unique Jewelry",
         "addr:housenumber": "33",
-        "addr:street": "North Main Street",
+        "addr:street": "Main Street",
         "addr:city": "Three Rivers",
         "addr:state": "MI",
         "addr:postcode": "49093"
@@ -20000,7 +18360,7 @@
         "shop": "gift",
         "name": "World Fare",
         "addr:housenumber": "37",
-        "addr:street": "North Main Street",
+        "addr:street": "Main Street",
         "addr:city": "Three Rivers",
         "addr:state": "MI",
         "addr:postcode": "49093"
@@ -20011,9 +18371,9 @@
       "id": "n1013",
       "tags": {
         "shop": "frame",
-        "name": "Golden Finch Frame & Gallery",
+        "name": "Golden Finch Framing",
         "addr:housenumber": "62",
-        "addr:street": "North Main Street",
+        "addr:street": "Main Street",
         "addr:city": "Three Rivers",
         "addr:state": "MI",
         "addr:postcode": "49093"
@@ -20024,9 +18384,9 @@
       "id": "n1014",
       "tags": {
         "shop": "second_hand",
-        "name": "Centsible Treasures",
+        "name": "Dollar Tree",
         "addr:housenumber": "58",
-        "addr:street": "North Main Street",
+        "addr:street": "Main Street",
         "addr:city": "Three Rivers",
         "addr:state": "MI",
         "addr:postcode": "49093"
@@ -20039,7 +18399,7 @@
         "amenity": "theatre",
         "name": "Riviera Theatre",
         "addr:housenumber": "48",
-        "addr:street": "North Main Street",
+        "addr:street": "Main Street",
         "addr:city": "Three Rivers",
         "addr:state": "MI",
         "addr:postcode": "49093"
@@ -20052,7 +18412,7 @@
         "shop": "appliance",
         "name": "River City Appliance",
         "addr:housenumber": "42",
-        "addr:street": "North Main Street",
+        "addr:street": "Main Street",
         "addr:city": "Three Rivers",
         "addr:state": "MI",
         "addr:postcode": "49093"
@@ -20065,7 +18425,7 @@
         "shop": "tattoo",
         "name": "Paparazzi Tattoo",
         "addr:housenumber": "45",
-        "addr:street": "North Main Street",
+        "addr:street": "Main Street",
         "addr:city": "Three Rivers",
         "addr:state": "MI",
         "addr:postcode": "49093"
@@ -20076,9 +18436,9 @@
       "id": "n1018",
       "tags": {
         "amenity": "bank",
-        "name": "Southern Michigan Bank & Trust",
+        "name": "Southern Michigan Bank",
         "addr:housenumber": "88",
-        "addr:street": "North Main Street",
+        "addr:street": "Main Street",
         "addr:city": "Three Rivers",
         "addr:state": "MI",
         "addr:postcode": "49093"
@@ -20161,47 +18521,11 @@
     "w221": {
       "tags": {
         "highway": "tertiary",
-        "name": "South Constantine Street"
+        "name": "Constantine Street"
       },
       "id": "w221",
       "nodes": ["n2080", "n1828", "n1863", "n1829"]
     },
-    "n1029": {
-      "id": "n1029",
-      "loc": [-85.638727, 41.938172]
-    },
-    "w222": {
-      "tags": {
-        "highway": "residential",
-        "name": "South Hook Avenue"
-      },
-      "id": "w222",
-      "nodes": ["n1029", "n1644"]
-    },
-    "n1030": {
-      "id": "n1030",
-      "loc": [-85.639991, 41.938176]
-    },
-    "w223": {
-      "tags": {
-        "highway": "residential",
-        "name": "South Lincoln Avenue"
-      },
-      "id": "w223",
-      "nodes": ["n1030", "n1635"]
-    },
-    "n1031": {
-      "id": "n1031",
-      "loc": [-85.64114, 41.938145]
-    },
-    "w224": {
-      "tags": {
-        "highway": "residential",
-        "name": "South Grant Avenue"
-      },
-      "id": "w224",
-      "nodes": ["n1031", "n1632"]
-    },
     "w225": {
       "id": "w225",
       "nodes": [
@@ -20251,9 +18575,11 @@
         "n2107",
         "n2141",
         "n2124",
+        "n3754",
         "n2121",
         "n2105",
         "n2108",
+        "n3755",
         "n2128",
         "n2110",
         "n2152",
@@ -20329,9 +18655,7 @@
     "w227": {
       "tags": {
         "highway": "secondary",
-        "name": "South Main Street",
-        "old_ref": "US 131",
-        "ref": "M 86"
+        "name": "Main Street"
       },
       "id": "w227",
       "nodes": ["n2994", "n3012", "n3011", "n2958"]
@@ -20339,9 +18663,7 @@
     "w228": {
       "tags": {
         "highway": "primary",
-        "name": "North Main Street",
-        "old_ref": "US 131",
-        "ref": "US 131 Business"
+        "name": "Main Street"
       },
       "id": "w228",
       "nodes": [
@@ -23965,6 +22287,334 @@
         "service": "alley",
         "surface": "unpaved"
       }
+    },
+    "n1029": {
+      "loc": [-85.640655, 41.942057],
+      "id": "n1029"
+    },
+    "w222": {
+      "id": "w222",
+      "nodes": ["n1029", "n1030", "n1031"],
+      "tags": {
+        "highway": "service"
+      }
+    },
+    "n1030": {
+      "loc": [-85.640947, 41.942057],
+      "id": "n1030"
+    },
+    "n1031": {
+      "loc": [-85.640957, 41.942593],
+      "id": "n1031"
+    },
+    "n1632": {
+      "id": "n1632",
+      "loc": [-85.643407, 41.942336]
+    },
+    "n1634": {
+      "id": "n1634",
+      "loc": [-85.643322, 41.942224]
+    },
+    "n1635": {
+      "id": "n1635",
+      "loc": [-85.643301, 41.942124]
+    },
+    "n1640": {
+      "id": "n1640",
+      "loc": [-85.64371, 41.942302]
+    },
+    "n1644": {
+      "id": "n1644",
+      "loc": [-85.643549, 41.942209]
+    },
+    "n1811": {
+      "id": "n1811",
+      "loc": [-85.643529, 41.94217]
+    },
+    "n1830": {
+      "loc": [-85.643532, 41.94204],
+      "id": "n1830"
+    },
+    "n1836": {
+      "loc": [-85.643482, 41.941976],
+      "id": "n1836"
+    },
+    "n1837": {
+      "loc": [-85.64345, 41.941945],
+      "id": "n1837"
+    },
+    "n1848": {
+      "loc": [-85.643397, 41.941924],
+      "id": "n1848"
+    },
+    "n2891": {
+      "loc": [-85.643236, 41.941895],
+      "id": "n2891"
+    },
+    "n3394": {
+      "id": "n3394",
+      "loc": [-85.64344, 41.941866]
+    },
+    "n3409": {
+      "id": "n3409",
+      "loc": [-85.643327, 41.941903]
+    },
+    "n3418": {
+      "id": "n3418",
+      "loc": [-85.643422, 41.941946]
+    },
+    "n3419": {
+      "id": "n3419",
+      "loc": [-85.643505, 41.942033]
+    },
+    "n3744": {
+      "id": "n3744",
+      "loc": [-85.643386, 41.941933]
+    },
+    "n3745": {
+      "loc": [-85.642776, 41.941161],
+      "id": "n3745"
+    },
+    "w223": {
+      "tags": {
+        "name": "Rocky River",
+        "waterway": "river"
+      },
+      "id": "w223",
+      "nodes": [
+        "n2213",
+        "n2171",
+        "n2183",
+        "n2180",
+        "n2205",
+        "n2177",
+        "n2179",
+        "n2218",
+        "n2200",
+        "n2188",
+        "n2169",
+        "n2196",
+        "n2162",
+        "n2170",
+        "n2211",
+        "n2216",
+        "n2204",
+        "n2220",
+        "n2164",
+        "n2210",
+        "n2217",
+        "n2189",
+        "n460",
+        "n453",
+        "n2282"
+      ]
+    },
+    "n3746": {
+      "id": "n3746",
+      "loc": [-85.637277, 41.948812]
+    },
+    "n3747": {
+      "id": "n3747",
+      "loc": [-85.637366, 41.94897]
+    },
+    "n3748": {
+      "id": "n3748",
+      "loc": [-85.637329, 41.94889]
+    },
+    "n3749": {
+      "id": "n3749",
+      "loc": [-85.629649, 41.952596]
+    },
+    "n3750": {
+      "loc": [-85.630291, 41.954684],
+      "id": "n3750"
+    },
+    "w224": {
+      "id": "w224",
+      "nodes": ["n3750", "n3751", "n3752"],
+      "tags": {
+        "highway": "service",
+        "service": "alley",
+        "surface": "unpaved"
+      }
+    },
+    "n3751": {
+      "loc": [-85.630284, 41.953713],
+      "id": "n3751"
+    },
+    "n3752": {
+      "loc": [-85.630269, 41.952463],
+      "id": "n3752"
+    },
+    "n3753": {
+      "loc": [-85.633933, 41.949896],
+      "id": "n3753"
+    },
+    "n3754": {
+      "id": "n3754",
+      "loc": [-85.629339, 41.941467]
+    },
+    "n3755": {
+      "id": "n3755",
+      "loc": [-85.629857, 41.94316]
+    },
+    "n3756": {
+      "id": "n3756",
+      "loc": [-85.629987, 41.944025]
+    },
+    "n3757": {
+      "loc": [-85.628538, 41.948604],
+      "id": "n3757"
+    },
+    "n3813": {
+      "loc": [-85.628479, 41.948649],
+      "id": "n3813"
+    },
+    "n3814": {
+      "loc": [-85.628413, 41.948679],
+      "id": "n3814"
+    },
+    "n3815": {
+      "loc": [-85.628336, 41.948694],
+      "id": "n3815"
+    },
+    "n3816": {
+      "loc": [-85.62826, 41.948694],
+      "id": "n3816"
+    },
+    "n3817": {
+      "loc": [-85.628185, 41.948679],
+      "id": "n3817"
+    },
+    "n3818": {
+      "loc": [-85.628103, 41.948649],
+      "id": "n3818"
+    },
+    "n3819": {
+      "loc": [-85.627482, 41.948395],
+      "id": "n3819"
+    },
+    "n3820": {
+      "loc": [-85.619957, 41.951168],
+      "id": "n3820"
+    },
+    "w364": {
+      "tags": {
+        "amenity": "school",
+        "name": "Three Rivers Middle School"
+      },
+      "id": "w364",
+      "nodes": [
+        "n3820",
+        "n3821",
+        "n3822",
+        "n3823",
+        "n3824",
+        "n3825",
+        "n3826",
+        "n3827",
+        "n3828",
+        "n3829",
+        "n3830",
+        "n3838",
+        "n3839",
+        "n3820"
+      ]
+    },
+    "n3821": {
+      "loc": [-85.619955, 41.952077],
+      "id": "n3821"
+    },
+    "n3822": {
+      "loc": [-85.619843, 41.952666],
+      "id": "n3822"
+    },
+    "n3823": {
+      "loc": [-85.619513, 41.95324],
+      "id": "n3823"
+    },
+    "n3824": {
+      "loc": [-85.619163, 41.953668],
+      "id": "n3824"
+    },
+    "n3825": {
+      "loc": [-85.618813, 41.953947],
+      "id": "n3825"
+    },
+    "n3826": {
+      "loc": [-85.618265, 41.954252],
+      "id": "n3826"
+    },
+    "n3827": {
+      "loc": [-85.617691, 41.954458],
+      "id": "n3827"
+    },
+    "n3828": {
+      "loc": [-85.616978, 41.95459],
+      "id": "n3828"
+    },
+    "n3829": {
+      "loc": [-85.615408, 41.954628],
+      "id": "n3829"
+    },
+    "n3830": {
+      "loc": [-85.615374, 41.951076],
+      "id": "n3830"
+    },
+    "w371": {
+      "tags": {
+        "amenity": "school",
+        "name": "Three Rivers High School"
+      },
+      "id": "w371",
+      "nodes": ["n3836", "n3835", "n3831", "n3834", "n3832", "n3833", "n3830", "n3838", "n3839", "n3837", "n3836"]
+    },
+    "n3831": {
+      "loc": [-85.61932, 41.947564],
+      "id": "n3831"
+    },
+    "n3832": {
+      "loc": [-85.610553, 41.94755],
+      "id": "n3832"
+    },
+    "n3833": {
+      "loc": [-85.610572, 41.951065],
+      "id": "n3833"
+    },
+    "w534": {
+      "id": "w534",
+      "nodes": ["n3836", "n3837", "n3839", "n3838", "n3834", "n3831", "n3835", "n3836"],
+      "tags": {
+        "barrier": "fence"
+      }
+    },
+    "n3834": {
+      "loc": [-85.617548, 41.94757],
+      "id": "n3834"
+    },
+    "n3835": {
+      "id": "n3835",
+      "loc": [-85.619842, 41.947939]
+    },
+    "n3836": {
+      "loc": [-85.619874, 41.950905],
+      "id": "n3836"
+    },
+    "n3837": {
+      "id": "n3837",
+      "loc": [-85.619695, 41.950911]
+    },
+    "n3838": {
+      "id": "n3838",
+      "loc": [-85.617591, 41.951078]
+    },
+    "n3839": {
+      "id": "n3839",
+      "loc": [-85.619551, 41.951065]
+    },
+    "n3840": {
+      "loc": [-85.626813, 41.947337],
+      "id": "n3840"
     }
   }
 }
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 1d08ec70d..ecfbf49e9 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -637,38 +637,121 @@
             "done": "done",
             "ok": "OK",
             "graph": {
-                "azaleamum_drive": "Azaleamum Drive",
-                "city_hall": "Three Rivers City Hall",
-                "conrail_rr": "Conrail Railroad",
-                "e_michigan_ave": "East Michigan Avenue",
-                "east_st": "East Street",
-                "elm_st": "Elm Street",
-                "fire_department": "Three Rivers Fire Department",
-                "first_baptist_church": "First Baptist Church",
-                "flower_st": "Flower Street",
-                "foster_st": "Foster Street",
-                "memory_isle_park": "Memory Isle Park",
-                "millard_st": "Millard Street",
-                "morris_ave": "Morris Avenue",
-                "n_andrews_st": "North Andrews Street",
-                "n_constantine_st": "North Constantine Street",
-                "n_main_st": "North Main Street",
-                "petting_zoo": "Scidmore Park Petting Zoo",
-                "portage_ave": "Portage Avenue",
-                "portage_river": "Portage River",
-                "railroad_dr": "Railroad Drive",
-                "riverwalk_trail": "Riverwalk Trail",
-                "rocky_river": "Rocky River",
-                "s_andrews_st": "South Andrews Street",
-                "s_constantine_st": "South Constantine Street",
-                "s_main_st": "South Main Street",
-                "scidmore_park": "Scidmore Park",
-                "south_st": "South Street",
-                "spring_st": "Spring Street",
-                "st_joseph_river": "Saint Joseph River",
-                "w_michigan_ave": "West Michigan Avenue",
-                "walnut_st": "Walnut Street",
-                "water_st": "Water Street"
+                "city": "Three Rivers",
+                "state": "MI",
+                "postcode": "49093",
+                "name": {
+                    "1st-avenue": "1st Avenue",
+                    "2nd-avenue": "2nd Avenue",
+                    "4th-avenue": "4th Avenue",
+                    "5th-avenue": "5th Avenue",
+                    "6th-avenue": "6th Avenue",
+                    "6th-street": "6th Street",
+                    "7th-avenue": "7th Avenue",
+                    "8th-avenue": "8th Avenue",
+                    "9th-avenue": "9th Avenue",
+                    "10th-avenue": "10th Avenue",
+                    "11th-avenue": "11th Avenue",
+                    "access-point-employment": "Access Point Employment",
+                    "adams-street": "Adams Street",
+                    "andrews-elementary-school": "Andrews Elementary School",
+                    "andrews-street": "Andrews Street",
+                    "armitage-street": "Armitage Street",
+                    "barrows-school": "Barrows School",
+                    "battle-street": "Battle Street",
+                    "bennett-street": "Bennett Street",
+                    "bowman-park": "Bowman Park",
+                    "collins-drive": "Collins Drive",
+                    "conrail-railroad": "Conrail Railroad",
+                    "conservation-park": "Conservation Park",
+                    "constantine-street": "Constantine Street",
+                    "cushman-street": "Cushman Street",
+                    "dollar-tree": "Dollar Tree",
+                    "douglas-avenue": "Douglas Avenue",
+                    "east-street": "East Street",
+                    "elm-street": "Elm Street",
+                    "flower-street": "Flower Street",
+                    "foster-street": "Foster Street",
+                    "french-street": "French Street",
+                    "garden-street": "Garden Street",
+                    "gem-pawnbroker": "Gem Pawnbroker",
+                    "golden-finch-framing": "Golden Finch Framing",
+                    "grant-avenue": "Grant Avenue",
+                    "hoffman-pond": "Hoffman Pond",
+                    "hoffman-street": "Hoffman Street",
+                    "hook-avenue": "Hook Avenue",
+                    "jefferson-street": "Jefferson Street",
+                    "kelsey-street": "Kelsey Street",
+                    "lafayette-park": "LaFayette Park",
+                    "las-coffee-cafe": "L.A.'s Coffee Cafe",
+                    "lincoln-avenue": "Lincoln Avenue",
+                    "lowrys-books": "Lowry's Books",
+                    "lynns-garage": "Lynn's Garage",
+                    "main-street-barbell": "Main Street Barbell",
+                    "main-street-cafe": "Main Street Cafe",
+                    "main-street-fitness": "Main Street Fitness",
+                    "main-street": "Main Street",
+                    "maple-street": "Maple Street",
+                    "marina-park": "Marina Park",
+                    "market-street": "Market Street",
+                    "memory-isle-park": "Memory Isle Park",
+                    "memory-isle": "Memory Isle",
+                    "michigan-avenue": "Michigan Avenue",
+                    "middle-street": "Middle Street",
+                    "millard-street": "Millard Street",
+                    "moore-street": "Moore Street",
+                    "morris-avenue": "Morris Avenue",
+                    "mural-mall": "Mural Mall",
+                    "paisanos-bar-and-grill": "Paisano's Bar and Grill",
+                    "paisley-emporium": "Paisley Emporium",
+                    "paparazzi-tattoo": "Paparazzi Tattoo",
+                    "pealer-street": "Pealer Street",
+                    "pine-river-road": "Pine River Road",
+                    "pine-street": "Pine Street",
+                    "pizza-hut": "Pizza Hut",
+                    "portage-avenue": "Portage Avenue",
+                    "portage-river": "Portage River",
+                    "preferred-insurance-services": "Preferred Insurance Services",
+                    "railroad-drive": "Railroad Drive",
+                    "raisin-river-road": "Raisin River Road",
+                    "river-city-appliance": "River City Appliance",
+                    "river-drive": "River Drive",
+                    "river-road": "River Road",
+                    "river-street": "River Street",
+                    "riverside-cemetery": "Riverside Cemetery",
+                    "riverwalk-trail": "Riverwalk Trail",
+                    "riviera-theatre": "Riviera Theatre",
+                    "rocky-river": "Rocky River",
+                    "sable-river-road": "Sable River Road",
+                    "saint-joseph-river": "Saint Joseph River",
+                    "scidmore-park-petting-zoo": "Scidmore Park Petting Zoo",
+                    "scidmore-park": "Scidmore Park",
+                    "scouter-park": "Scouter Park",
+                    "sherwin-williams": "Sherwin-Williams",
+                    "shiawassee-river-road": "Shiawassee River Road",
+                    "south-street": "South Street",
+                    "southern-michigan-bank": "Southern Michigan Bank",
+                    "spring-street": "Spring Street",
+                    "sturgeon-river-road": "Sturgeon River Road",
+                    "three-rivers-city-hall": "Three Rivers City Hall",
+                    "three-rivers-elementary-school": "Three Rivers Elementary School",
+                    "three-rivers-fire-department": "Three Rivers Fire Department",
+                    "three-rivers-high-school": "Three Rivers High School",
+                    "three-rivers-middle-school": "Three Rivers Middle School",
+                    "three-rivers-post-office": "Three Rivers Post Office",
+                    "three-rivers-public-library": "Three Rivers Public Library",
+                    "three-rivers": "Three Rivers",
+                    "unique-jewelry": "Unique Jewelry",
+                    "walnut-street": "Walnut Street",
+                    "washington-street": "Washington Street",
+                    "water-street": "Water Street",
+                    "west-street": "West Street",
+                    "wheeler-street": "Wheeler Street",
+                    "william-towing": "William Towing",
+                    "willow-drive": "Willow Drive",
+                    "wood-street": "Wood Street",
+                    "world-fare": "World Fare"
+                }
             },
             "welcome": {
                 "title": "Welcome",
@@ -741,7 +824,7 @@
                 "square_building": "The house that you just added will look even better with perfectly square corners. **Click on the {button} button to square the building shape.**",
                 "retry_square": "You didn't click the Square button. Try again.",
                 "done_square": "See how the corners of the building moved into place? Let's learn another useful trick.",
-                "add_tank": "Let's trace this circular storage tank. **Click the {button} Area button to add a new area.**",
+                "add_tank": "Next we'll trace this circular storage tank. **Click the {button} Area button to add a new area.**",
                 "start_tank": "Don't worry, you won't need to draw a perfect circle. Just draw an area inside the tank that touches its edge. **Click or press spacebar to place a starting node on the edge of the tank.**",
                 "continue_tank": "Add a few more points around the edge. The circle will be created outside the points that you draw. Finish the area by clicking on the starting node. **Continue tracing the tank.**",
                 "search_tank": "**Search for '{name}'**",
diff --git a/modules/ui/intro/line.js b/modules/ui/intro/line.js
index ece82a063..8578a3856 100644
--- a/modules/ui/intro/line.js
+++ b/modules/ui/intro/line.js
@@ -60,13 +60,13 @@ export function uiIntroLine(context, reveal) {
 
         lineId = null;
 
-        var padding = 100 * Math.pow(2, context.map().zoom() - 18);
+        var padding = 70 * Math.pow(2, context.map().zoom() - 18);
         var box = pad(start, padding, context);
         box.height = box.height + 100;
         reveal(box, t('intro.lines.start'));
 
         context.map().on('move.intro drawn.intro', function() {
-            padding = 100 * Math.pow(2, context.map().zoom() - 18);
+            padding = 70 * Math.pow(2, context.map().zoom() - 18);
             box = pad(start, padding, context);
             box.height = box.height + 100;
             reveal(box, t('intro.lines.start'), { duration: 0 });
@@ -98,7 +98,7 @@ export function uiIntroLine(context, reveal) {
             var box = pad(midpoint, padding, context);
             box.height = box.height * 2;
             reveal(box,
-                t('intro.lines.intersect', { name: t('intro.graph.flower_st') })
+                t('intro.lines.intersect', { name: t('intro.graph.name.flower-street') })
             );
 
             context.map().on('move.intro drawn.intro', function() {
@@ -106,7 +106,7 @@ export function uiIntroLine(context, reveal) {
                 box = pad(midpoint, padding, context);
                 box.height = box.height * 2;
                 reveal(box,
-                    t('intro.lines.intersect', { name: t('intro.graph.flower_st') }),
+                    t('intro.lines.intersect', { name: t('intro.graph.name.flower-street') }),
                     { duration: 0 }
                 );
             });
@@ -126,7 +126,7 @@ export function uiIntroLine(context, reveal) {
                 return;
             else if (mode.id === 'select') {
                 var box = pad(intersection, 80, context);
-                reveal(box, t('intro.lines.restart', { name: t('intro.graph.flower_st') }));
+                reveal(box, t('intro.lines.restart', { name: t('intro.graph.name.flower-street') }));
                 d3.select(window).on('mousedown.intro', eventCancel, true);
                 timeout(chapter.restart, 3000);
                 return;
diff --git a/modules/ui/intro/navigation.js b/modules/ui/intro/navigation.js
index 8b91c3689..88468e74a 100644
--- a/modules/ui/intro/navigation.js
+++ b/modules/ui/intro/navigation.js
@@ -140,7 +140,7 @@ export function uiIntroNavigation(context, reveal) {
         context.history().reset('initial');  // ensure spring street exists
 
         reveal('.search-header input',
-            t('intro.navigation.search', { name: t('intro.graph.spring_st') }));
+            t('intro.navigation.search', { name: t('intro.graph.name.spring-street') }));
 
         d3.select('.search-header input')
             .on('keyup.intro', checkSearchResult);
@@ -150,7 +150,7 @@ export function uiIntroNavigation(context, reveal) {
     function checkSearchResult() {
         var first = d3.select('.feature-list-item:nth-child(0n+2)'),  // skip "No Results" item
             firstName = first.select('.entity-name'),
-            name = t('intro.graph.spring_st');
+            name = t('intro.graph.name.spring-street');
 
         if (!firstName.empty() && firstName.text() === name) {
             reveal(first.node(), t('intro.navigation.choose', { name: name }));
@@ -178,7 +178,7 @@ export function uiIntroNavigation(context, reveal) {
         timeout(function() {
             reveal('.entity-editor-pane',
                 t('intro.navigation.chosen', {
-                    name: t('intro.graph.spring_st'),
+                    name: t('intro.graph.name.spring-street'),
                     button: icon('#icon-close', 'pre-text')
                 })
             );