additional minor tweaks