fix header and validation