larger timeout for CloudFiles storage and some tiny cleanups