fixed all remaining header bugs