fixing errors and adding checks for unmarked evaluations in certain scenarios.