WIP asserts->nbasserts for consistency
code review fixes