added new sorting-classes and minor changes in other classes