enable toy data set loading + minor fixes