Tidied up unit type code, added descriptors.