DataGenerator bugs fixed, TODOs added