clean up and minor tweaks