some more minor tweaks