various minor fixes to the parser to align with HQMF parsing