fixing parser bugs