More armor and weapon improvments