Minor changes, getting ready to overhaul nucdiv for variable sample configuration