a few last tweaks