caching images and other smallfixes 2