small changes to cluster setup
some final cleanup