Accuracy evaluation, classifier bug fixes