some parsing enhancements