adding cluster and reports fixes