Cleanup and increase specificity of grammar scopes
Add punctuation scopes to grammar