minor tweaks, clean up