refactor NF init, more work on locs/traveltimes