Hey thanks for your feedback!

I ended up pushing an update with both your ideas.