made a few tweaks