a few more minor tweaks