support for markup-like grammars, grammar extensions, minor edits