lots of little changes for Clouds