simplify, extend grammar, token parse order setting, edits