Change box to Ubuntu cloud image, smaller tweaks and cleanup