More images, clean up some things.