repaired issues in parser