Fixed the spelling of some HeaderId fields and added a few new ones