nv: several fixes, work in progress