small fixes in preparation for evaluation