Added descriptive labels and fixed a bug