fixed armorTypes and some vlidity tests