header and config fix