more updates and cleanup