fix choice of Z1 in the new compator; move best candidate selection option to MasterPy