more fixes to header