Fixing some bugs and change some labels.