parser updates
merge thurs