armor and a few improvements