Added armor and fixed some things