Better clustering support for small groups and more bug fixes.