Expand grammar, handle punctuation correctly