small tweaks based on feedback