fix sample point selection bug
cosmetic/capsulated changes