Some changes to the weapon code here.