minor tweaks;