more final tweaks