fixing suggestions that came back from the evaluation