fixed order issue with errors. working on code gen. tests still pass