Fix header and add missing arrays