Fixing single node Clearwater playbook
Various bug fixes