Last minute corrections and changes