further adjustments to image manager