minor tweaks-n-fixes