Add label and some bugfix