Added some additional labels and removed some useless stuff.