* nz_error improvements
* Minor fixes