misc tweaks ...