images and other small fixes