grammar extended, tests and syntax definitions updated