A few further tweaks based on feedback