- fixed some labeling faults