New edits to evaluation and some small edits to other chapters