some more changes to code generation script