New clustering: bugfixes