Remove the need for specific versions of nfindr by using as.matrix
Fixed small bug with sample selection