Added auto add armor and bug fixes