numerous parser fixes