images and bug fixes