fixed some bugs in the parser