Updated nmrfn, minor changes