grammar, parser major fixes