Fixed up some weap stuff