fix bug with missing labels
improve labels