parser updates based on Steve M code review comments