By hitting the safety, I presume you mean hitting the safety button extending from the tang as you push the bolt back into the action. The safety button can go in two ways. The button is not symmetrical. Turn it around. I doubt that this is your problem as I believe the clearance is adequate either way, but...
Also make sure the bolt shroud is aligned, in other words the bolt has not become "uncocked". The shroud should be positioned horizontally as the bolt is inserted (same plane as the bolt lugs). If the bolt has become "uncocked" you will have to manually re-cock it.
I am having a tough time understanding the "reset" question. The bolt should be removed by removing to the rear and pulling the "bolt" stop lever out (on left side of action). I usually find that the bolt will easily push in past the "bolt stop" (when reinstalling) without even activating the lever. If by reset you mean the stop has stuck in the out position, you need to clean the area and lubricate it so that the stop returns by the installed spring. I may be missing the point, but hope helps.