I wasn't expecting much out of it when I got it, so I figure I'll just take things one step at a time. Haven't tried shooting it yet, going to take it to a local gunsmith to have it fully examined. After looking around however, my rifle isn't the only one to have the safety issue. It stems, as I suspected, from replacing both the original trigger and the cocking piece with a "cock on open" kit. The bolt IS a P17 Enfield bolt, and has an "E" marking on the bolt handle and an "R" marking on the sleeve. When the cocking piece is removed, the bolt will cycle and extract rounds from the chamber with no problems, which makes me think that th cocking piece may be the culprit. No modifications have been made to the bolt that I can see after comparing it to many other pics online, so I'm praying that a new cocking piece may solve at least part of the problem. I'll have a better idea after I take it to my local gunsmith though. Again, thanks for the advice. Let's just hope I'm not trying to polish a turd with all my endeavors...