Housecleaning on headers. Minor fixes.