fixed cluster control functionality + minor fixes