clustering works now, numbering needs fixing