more mapping and hair pulling

https://www.openstreetmap.org/user/Circeus/diary/7171