more parser fixes, runs through errors now