Minor remaining issues resolved

The Armor display works properly now, and shields are also tested.