image and fixes