update with latest datagen files and neo4j fixes