Small tweaks based on feedback from @markus101