added a few tweaks