Minor changes before trying to integrate the finer finger detection.