Oscillation prevention feature

This adds measures to prevent oscillating behavior in the cluster.
Adds some cleanup after extensive changes while fixing merge conflicts