Many final changes