misc updates/clean up