more cloud init, misc fixes