more flexible stop selecting, clean up