Mileva clean up of digitizer and addition of clustering