some more cleanup and refactory for the new Label stuff