Some last touches