header cleanups
more header work