No images for now, plus minor adjustments