incorporate local simplifications, better error codes, separate note group.