Update handling of punctuation marks and allowed words.