other minor tweaks