make sure to wait until all objects are added before returning, change some logging