misc cosmetic tweaks