Some monsters updates and weapon switch fixes