added completely MS2-compatible and almost MS3-compatible grammar definition