1.8 Armour checks

Also added/updated some comments