updates
Futher regrouping of punctuation formatting.