Several small final changes