improvements to image picking