updated tools/images, some more logic