More images and fix