adjust formatting, fix parsing bug for fields with :