fixes + preparation for final evaluation