small changes to weapon stuff