numerous parser improvements.