parser improvements