fixed more header issues