Sorry about the bbox on this one; I got a bit carried away. I may have been slightly heavy handed with tertiary here, but I wasn't just marking any road with a yellow line as such either. If local opinion disagrees with any of these changes, please let me know and I'll happily readjust the classification.