Fixes in the parser + documentation of grammar