minor tweaks for previous commit