25.2, add "use equivalency chart as needed" except probs 1, 21, 22 per Matt
21.4, 22.1 corrections per Matt