various cosmetic tweaks