fixing header and minor