legend and label fixes