Added some more punctuation handling