Fix off by ones in word and punctuation selection