final final tweaks