More cleanup; setup ButtonSet to identify points