updates, cleanups due to code generation improvements
cleanup and better naming