Bug fixes to new Grammars

Parses all files tested the old grammar parsed corretcly. And of course
some more :).