Add Armor, revise Bayles and pet focuses