some fixes on images with caption