Last minute changes and corrections