Revise some syntax, add grammar.