some enhancements in parsing