add a few tweaks