various minor tweaks