punctuation logic tweaks