Updates on several classes, added Armour Types as classes