Fixed mistakes in armor calculations