a few tweaks;