Changes in images, some fixes