#1052 tweaks based on feedback from @tractorcow