a few last changes