More work on header tools