more minor tweaks