cloud further developments/fixes