last few tweaks