Extend to deal with punctuation and capitalization