even-more-minor tweaks