more updates to code generation