Updated ntf with same bug fixes, dqe/ntf also interpolated now.