Changes requested in review of last pass. Also pulled isThumb into a