fixed bugs, add label