Fix header, changed labels