a few tweaks here and there