Fixed some bugs, add some labels