Adjustments / fixes... And add knn for regression