Improved quality of data and changed some labels