Change to using a TreeMap for headers
Fix lowercase bug in the parser generator