Minor parser updates and sample parser output for review