more generator dialogs, fixes, etc.