Thanks chaps.
As to the muzzels, yes you're right, there are a couple that I should have done, but in general I find most of the orky bolter muzzels too fiddly. On the Hvy Plasma guns, I like to think that they differ from other weapons and that the plasma builds up around the smaller side holes.
Started varnishing this morning. Seems like my botched repair is holding.