utility updates, minor tweaks