Images and more tweaks