Update docs and grammar specification