image and some fixes