fixed some changes got lost somehow. Also the label method could do more