some minor tweaks