minor tweaks based on feedback