More additions and corrections

https://api.openstreetmap.org/user/ThePaperBoy/diary/5765