more updates/cleanup