bit more cleanup work on materials, ammo counts