Various style tweaks based on feedback