Fixed camera and improved weapon state checking