Small improvements on selection and scoring sample set