more work on WeaponEntity