Made some last changes