did some last changes