starting revisions on ch2; adding tweaks in other places