assorted minor tweaks