This looks mostly right from what we can see, and not easy to survey so closing this note as discussed at recent OSM Edinburgh meetup.
Please reopen with more details of what's wrong if you have them 