fixes in parser