a few more final tweaks