few last tweaks