Armor equip fixes. Some refactoring.