even more parser fixes