Added labelling to circle fit selection, fixed NPE in same and fixed no
fit cases in circle and ellipse fitting