fix classes, lambdas, scoring