A few last touches