Split entire dataset inside best_of_best, some other changes