minor tweaks, because