some changes to image handling