final draft of data gen

minor fix
working tests with generated data; looks good

fix

cleany