few header changes