better default images, minor cleanup, more images