Fixed overlapping labels, general bugfix