reworked player, and weapon