Well done BSA. As far as the trigger goes, you could consider a nice trigger shoe. I have one on an old M77 that was rebarreled to 338-06 AI. It was a rifle my had had for years as a 25-06 and has a nice trigger shoe that helps the feel out a bunch. He would always joke about it as being the poor man’s trigger job.