trivial grammar and syntax updates