tweaks and fixes for the cloud-tm demo