more updates to code generator