improvements to nf analysis