misc updates/cleanup