Some armor bugs fixed.