New images and some fixes