Greatly improved support for punctuation.