some more progress with codegen.sh