Add fixes to evaluation chapter