Rearrange some grammar rules

...and add reminders about missing rules
Add rules for parsing booleans
Fix ordering for string/number