Lot's of changes to output HL7