modified the weapon stuff a bit