Map is looking a lot nicer. Still have to deal with waterway issue (they are relations, not ways)