a few tweaks...