fixed a few more labeling issues