last changes and corrections