generator-updates

@jweakley Let me know what you think