started working on data generator, fixed model