Add more punctuation and control keywords