add individual class to evaluation algorithms

plus some comments