some fixes to header