a few tweaks here nd there