Weapon and minor updates for clarity