some more header changes