Change versioning of image + some tweaks