Made a bunch of stuff private, fixed pistol reloading