misc minor tweaks