CLOUDIFY-1944 improved output and bug fixes
CLOUDIFY-1944 some more bug fixing