Correct header and other improvements (contra)