a few tweaks for options