clean up punctuation patch and fix floating CJK punctuation