More changes to weapon giving.  Still not complete.