more improvements to cpt labels