more parser updates