fixed data gen issues
latest