added better parsing around header values so that I can correctly detect multiple header values on the same line