some more tweaks based on feedback