In addition to this, the air box was replaced for a new one, this meant stripping off the back-end again but it was worth it, being a plastic part, the photo's don't show how scratched it is, the new one is mint and unblemished, I think it was worth it.

I also found some NOS switch gear (left and right) so I'll fit them when I've sorted the handlebars, either re-chrome or replace not sure yet.