major fixes in parser module