A lot of edits and changes.

https://www.openstreetmap.org/user/zman809xx/diary/407207