changed the weapon-handling - added a few method()-comments