Updated units and desc. Fixed bugs
Merge branch '60716408' of https://github.com/crobinsonut/CADRE into CADRE-units-desc
Merge branch '60716408' of https://github.com/crobinsonut/CADRE into CADRE-units-desc
Merge branch '60716408' of https://github.com/crobinsonut/CADRE into CADRE-units-desc
Fixed bugs