More images work, still not totally fixed