Many more changes...

https://www.openstreetmap.org/user/eagsc7/diary/16605