Speed improvements, data set splitting