Fixes and improvements to nvar.
Fixes and improvements to nvar.