Images and varios upgrades