more improvements to parsers