few last changes