Added demClassification and demRegression (and few minor changes).