Fixed up some more stuff with the pistol, merged the shotgun with the silenced shotgun.