Updated grammars, improved sematic check