almost final tweaks