weapon bug fixes