script fixup and added generator.