fixed some parser bugs