tweaks and fixes for cloud-tm demo

some tweaks and corrections for the cloud-tm demo