fixes in source formatting, passing small number of code gen tests