new punctuation, spaces upgraded