cleanup, evaluation works, contours to be checked