some last changes