Basic image support, several tweaks.