Reworked the segmentation of 2d images

I used both clustering and a watershed approach to refine the segments.