made it easier to add additional headers

this includes the updates from the other pull requests as well