The books you talk about are basicly my reference too so...The safety probably broke at the top and someone changed it with whatever they could get. You can hunt around and probably find a correct one. The rest look OK for the most. I'm surprised that your gas cylinder seems to have finish on it and the lock and screw also. Most of those went silver almost immediately.