evaluation fixed, optimization started, some tests