cleaned up cross-validation portion, considers new logreg, f-score problem