Add punctuation scopes

Also fixed a couple bugs I noticed in the grammar while I was at it and added a shortcut to the grammar.