Last changes and corrections