header and other changes