Some corrections and last changes