two more changes

address evaluation procedure 
TODO: need to update the text for Task 2 in the evaluation after you merge