more minor tweaks: